Index: branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1788) +++ branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1789) @@ -19,6 +19,79 @@ 1D2A1AF513743A2600787720 /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; sourceTree = ""; }; 26F2051D13D04B060020D229 /* exfat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = exfat.h; sourceTree = ""; }; 26F2052013D04B130020D229 /* exfat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exfat.c; sourceTree = ""; }; + 369689D014BD0AF10013D77F /* BLOCKERS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BLOCKERS; sourceTree = ""; }; + 369689D114BD0AF10013D77F /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + 369689D214BD0B470013D77F /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; + 36AB75A114BD0866005B8045 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + 36AB75A214BD0866005B8045 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + 36AB75A314BD0866005B8045 /* device_befs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o.png; sourceTree = ""; }; + 36AB75A414BD0866005B8045 /* device_befs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs.png; sourceTree = ""; }; + 36AB75A514BD0866005B8045 /* device_cdrom_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom_o.png; sourceTree = ""; }; + 36AB75A614BD0866005B8045 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + 36AB75A714BD0866005B8045 /* device_ext3_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o.png; sourceTree = ""; }; + 36AB75A814BD0866005B8045 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + 36AB75A914BD0866005B8045 /* device_fat_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat_o.png; sourceTree = ""; }; + 36AB75AA14BD0866005B8045 /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o.png; sourceTree = ""; }; + 36AB75AC14BD0866005B8045 /* device_freebsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd.png; sourceTree = ""; }; + 36AB75AD14BD0866005B8045 /* device_generic_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic_o.png; sourceTree = ""; }; + 36AB75AE14BD0866005B8045 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo_o.png; sourceTree = ""; }; + 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo.png; sourceTree = ""; }; + 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o.png; sourceTree = ""; }; + 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion.png; sourceTree = ""; }; + 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_o.png; sourceTree = ""; }; + 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o.png; sourceTree = ""; }; + 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl.png; sourceTree = ""; }; + 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger_o.png; sourceTree = ""; }; + 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger.png; sourceTree = ""; }; + 36AB75B814BD0866005B8045 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo_o.png; sourceTree = ""; }; + 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo.png; sourceTree = ""; }; + 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o.png; sourceTree = ""; }; + 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion.png; sourceTree = ""; }; + 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_o.png; sourceTree = ""; }; + 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o.png; sourceTree = ""; }; + 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl.png; sourceTree = ""; }; + 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger_o.png; sourceTree = ""; }; + 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger.png; sourceTree = ""; }; + 36AB75C214BD0866005B8045 /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; + 36AB75C314BD0866005B8045 /* device_ntfs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o.png; sourceTree = ""; }; + 36AB75C414BD0866005B8045 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + 36AB75C514BD0866005B8045 /* device_openbsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o.png; sourceTree = ""; }; + 36AB75C614BD0866005B8045 /* device_openbsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd.png; sourceTree = ""; }; + 36AB75C714BD0866005B8045 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + 36AB75C814BD0866005B8045 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + 36AB75C914BD0866005B8045 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + 36AB75CA14BD0866005B8045 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + 36AB75CB14BD0866005B8045 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + 36AB75CC14BD0866005B8045 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + 36AB75CD14BD0866005B8045 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + 36AB75CE14BD0866005B8045 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + 36AB75D114BD0866005B8045 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + 36AB75D214BD0866005B8045 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + 36AB75D414BD0866005B8045 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + 36AB75D614BD0866005B8045 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + 36AB75D714BD0866005B8045 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + 36AB75D814BD0866005B8045 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + 36AB75D914BD0866005B8045 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + 36AB75DA14BD0866005B8045 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + 36AB75DC14BD0866005B8045 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + 36AB75DD14BD0866005B8045 /* thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb.png; sourceTree = ""; }; + 36AB75E114BD091C005B8045 /* InstallLog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = InstallLog.sh; sourceTree = ""; }; + 36AB75E314BD0925005B8045 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + 36AB75E414BD092D005B8045 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = preinstall; sourceTree = ""; }; + 36AB75E514BD095E005B8045 /* Control.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Control.txt; path = OptionalSettings/Control.txt; sourceTree = ""; }; + 36AB75E614BD095E005B8045 /* General.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = General.txt; path = OptionalSettings/General.txt; sourceTree = ""; }; + 36AB75E714BD095E005B8045 /* KernelFlags.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = KernelFlags.txt; path = OptionalSettings/KernelFlags.txt; sourceTree = ""; }; + 36AB75E814BD095E005B8045 /* PowerManagement.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PowerManagement.txt; path = OptionalSettings/PowerManagement.txt; sourceTree = ""; }; + 36AB75E914BD095E005B8045 /* Resolution.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Resolution.txt; path = OptionalSettings/Resolution.txt; sourceTree = ""; }; + 36AB75EA14BD095E005B8045 /* Video.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Video.txt; path = OptionalSettings/Video.txt; sourceTree = ""; }; 65ED53931204B83200B22507 /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = ""; }; 6DBAFD1313B0D21E0047ED33 /* modules_support.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = modules_support.s; sourceTree = ""; }; 6DBAFD1413B0D21E0047ED33 /* modules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modules.c; sourceTree = ""; }; @@ -651,9 +724,20 @@ 6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = ""; }; 6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = ""; }; 6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = ""; }; + A34125FD14BA3ED3002C359C /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; + A34125FE14BA3EE8002C359C /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Conclusion.rtfd; sourceTree = ""; }; + A34125FF14BA3F3D002C359C /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260014BA3F3D002C359C /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260114BA3F3D002C359C /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260214BA3F3D002C359C /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260314BA3F3D002C359C /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260414BA3F3D002C359C /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260514BA3F3D002C359C /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260614BA3F3D002C359C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260714BA3F3D002C359C /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260814BA3F3D002C359C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260914BA3F3D002C359C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Conclusion.rtfd; sourceTree = ""; }; A354B6271495124F00D81AA5 /* ESPpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ESPpostinstall; sourceTree = ""; }; - A354B6281495124F00D81AA5 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - A354B6291495124F00D81AA5 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = preinstall; sourceTree = ""; }; A354B62A1495124F00D81AA5 /* Standardpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Standardpostinstall; sourceTree = ""; }; A354B62C149514DE00D81AA5 /* CheckDiskMicrocode.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckDiskMicrocode.sh; sourceTree = ""; }; A354B62D149514DE00D81AA5 /* CheckFatType.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckFatType.sh; sourceTree = ""; }; @@ -662,7 +746,6 @@ A354B630149514DE00D81AA5 /* CheckPreviousChameleon.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckPreviousChameleon.sh; sourceTree = ""; }; A354B631149514DE00D81AA5 /* CheckProceed.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckProceed.sh; sourceTree = ""; }; A354B632149514DE00D81AA5 /* CheckWindowsDiskSignature.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckWindowsDiskSignature.sh; sourceTree = ""; }; - A354B633149514DE00D81AA5 /* InstallLog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = InstallLog.sh; sourceTree = ""; }; A354B634149514DE00D81AA5 /* MountESP.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = MountESP.sh; sourceTree = ""; }; A354B635149514DE00D81AA5 /* patch */ = {isa = PBXFileReference; lastKnownFileType = file; path = patch; sourceTree = ""; }; A354B636149514DE00D81AA5 /* SetActivePartition.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = SetActivePartition.sh; sourceTree = ""; }; @@ -935,11 +1018,11 @@ A37D7D61141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/License.rtf; sourceTree = ""; }; A37D7D62141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D63141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = fr; path = fr.lproj/Welcome.rtfd; sourceTree = ""; }; - A37D7D64141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Conclusion.rtfd"; sourceTree = ""; }; - A37D7D65141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "hr-HR"; path = "hr-HR.lproj/Description.html"; sourceTree = ""; }; - A37D7D66141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "hr-HR"; path = "hr-HR.lproj/License.rtf"; sourceTree = ""; }; - A37D7D67141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr-HR"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; - A37D7D68141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Welcome.rtfd"; sourceTree = ""; }; + A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = hr; path = "hr.lproj/Description.html"; sourceTree = ""; }; + A37D7D66141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = hr; path = "hr.lproj/License.rtf"; sourceTree = ""; }; + A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; + A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; A37D7D69141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = id; path = id.lproj/Conclusion.rtfd; sourceTree = ""; }; A37D7D6A141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = id; path = id.lproj/Description.html; sourceTree = ""; }; A37D7D6B141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = id; path = id.lproj/License.rtf; sourceTree = ""; }; @@ -970,6 +1053,19 @@ A37D7D84141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = sr; path = sr.lproj/License.rtf; sourceTree = ""; }; A37D7D85141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D86141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = sr; path = sr.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA414BCB71F0059212A /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA514BCB71F0059212A /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA614BCB71F0059212A /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA714BCB73D0059212A /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA814BCB73D0059212A /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA914BCB73D0059212A /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAA14BCB7BE0059212A /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAB14BCB7BE0059212A /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAC14BCB7BE0059212A /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAD14BCB7E10059212A /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAE14BCB7E10059212A /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAF14BCB7E10059212A /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAB014BCB7E10059212A /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Welcome.rtfd; sourceTree = ""; }; A3F1F267141B9B3B00DDA709 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; @@ -1143,37 +1239,6 @@ B0056DD911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; B0056DDA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; B0056DDB11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; - B0056DDD11F3868000754B65 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; - B0056DDE11F3868000754B65 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; - B0056DDF11F3868000754B65 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; - B0056DE011F3868000754B65 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; - B0056DE111F3868000754B65 /* device_fat16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat16.png; sourceTree = ""; }; - B0056DE211F3868000754B65 /* device_fat32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat32.png; sourceTree = ""; }; - B0056DE311F3868000754B65 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; - B0056DE411F3868000754B65 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; - B0056DE511F3868000754B65 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; - B0056DE611F3868000754B65 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; - B0056DE711F3868000754B65 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; - B0056DE811F3868000754B65 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; - B0056DE911F3868000754B65 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; - B0056DEA11F3868000754B65 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; - B0056DEB11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - B0056DEC11F3868000754B65 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; - B0056DED11F3868000754B65 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; - B0056DEE11F3868000754B65 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; - B0056DEF11F3868000754B65 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; - B0056DF011F3868000754B65 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; - B0056DF111F3868000754B65 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; - B0056DF211F3868000754B65 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; - B0056DF311F3868000754B65 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; - B0056DF411F3868000754B65 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; - B0056DF511F3868000754B65 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; - B0056DF611F3868000754B65 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; - B0056DF711F3868000754B65 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; - B0056DF811F3868000754B65 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; - B0056DF911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; - B0056DFA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; - B0056DFB11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056DFD11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; B0056DFE11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056E0011F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; @@ -1209,24 +1274,77 @@ 08FB7794FE84155DC02AAC07 /* Chameleon */ = { isa = PBXGroup; children = ( + B0056D8211F3868000754B65 /* APPLE_LICENSE */, B0056DBA11F3868000754B65 /* artwork */, + 369689D014BD0AF10013D77F /* BLOCKERS */, + 369689D114BD0AF10013D77F /* Cconfig */, + B0056D8111F3868000754B65 /* CHANGES */, + B0056D8011F3868000754B65 /* coding_standards.txt */, + B0056D7F11F3868000754B65 /* CREDITS */, B0056E0611F3868000754B65 /* doc */, + B0146F0011FDEFB90010765C /* GPL_V2_LICENSE */, B0056CE511F3868000754B65 /* i386 */, + A360AA7D14136C1A00084D3F /* Make.rules */, + B0056D7D11F3868000754B65 /* Makefile */, + 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */, B0056D8311F3868000754B65 /* package */, - B0056D8211F3868000754B65 /* APPLE_LICENSE */, - B0056D7F11F3868000754B65 /* CREDITS */, - B0056D8111F3868000754B65 /* CHANGES */, - B0146F0011FDEFB90010765C /* GPL_V2_LICENSE */, B0146EFF11FDEF550010765C /* README */, - 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */, B0056D7C11F3868000754B65 /* TODO */, - B0056D7D11F3868000754B65 /* Makefile */, - A360AA7D14136C1A00084D3F /* Make.rules */, - B0056D8011F3868000754B65 /* coding_standards.txt */, + 369689D214BD0B470013D77F /* version */, ); name = Chameleon; sourceTree = ""; }; + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = { + isa = PBXGroup; + children = ( + 364E0DE114BCFB7A00F55E58 /* InstallerLog */, + 364E0DE314BCFB7A00F55E58 /* Post */, + 364E0DE514BCFB7A00F55E58 /* Pre */, + ); + name = Scripts.templates; + sourceTree = ""; + }; + 364E0DE114BCFB7A00F55E58 /* InstallerLog */ = { + isa = PBXGroup; + children = ( + 36AB75E114BD091C005B8045 /* InstallLog.sh */, + ); + name = InstallerLog; + path = Scripts.templates/InstallerLog; + sourceTree = ""; + }; + 364E0DE314BCFB7A00F55E58 /* Post */ = { + isa = PBXGroup; + children = ( + 36AB75E314BD0925005B8045 /* postinstall */, + ); + name = Post; + path = Scripts.templates/Post; + sourceTree = ""; + }; + 364E0DE514BCFB7A00F55E58 /* Pre */ = { + isa = PBXGroup; + children = ( + 36AB75E414BD092D005B8045 /* preinstall */, + ); + name = Pre; + path = Scripts.templates/Pre; + sourceTree = ""; + }; + 36B43E8114BCE91300D29461 /* OptionalSettings */ = { + isa = PBXGroup; + children = ( + 36AB75E514BD095E005B8045 /* Control.txt */, + 36AB75E614BD095E005B8045 /* General.txt */, + 36AB75E714BD095E005B8045 /* KernelFlags.txt */, + 36AB75E814BD095E005B8045 /* PowerManagement.txt */, + 36AB75E914BD095E005B8045 /* Resolution.txt */, + 36AB75EA14BD095E005B8045 /* Video.txt */, + ); + name = OptionalSettings; + sourceTree = ""; + }; 6DBAFD1713B0D4590047ED33 /* include */ = { isa = PBXGroup; children = ( @@ -2330,8 +2448,6 @@ isa = PBXGroup; children = ( A354B6271495124F00D81AA5 /* ESPpostinstall */, - A354B6281495124F00D81AA5 /* postinstall */, - A354B6291495124F00D81AA5 /* preinstall */, A354B62A1495124F00D81AA5 /* Standardpostinstall */, ); path = Main; @@ -2347,7 +2463,6 @@ A354B630149514DE00D81AA5 /* CheckPreviousChameleon.sh */, A354B631149514DE00D81AA5 /* CheckProceed.sh */, A354B632149514DE00D81AA5 /* CheckWindowsDiskSignature.sh */, - A354B633149514DE00D81AA5 /* InstallLog.sh */, A354B634149514DE00D81AA5 /* MountESP.sh */, A354B635149514DE00D81AA5 /* patch */, A354B636149514DE00D81AA5 /* SetActivePartition.sh */, @@ -2951,6 +3066,8 @@ B0056D8311F3868000754B65 /* package */ = { isa = PBXGroup; children = ( + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */, + 36B43E8114BCE91300D29461 /* OptionalSettings */, A35D2187141A75DC00969AC0 /* slimpkg.sh */, A35D2188141A75DC00969AC0 /* buildpkg.sh */, A35D2189141A75DC00969AC0 /* builddmg.sh */, @@ -3023,37 +3140,67 @@ B0056DDC11F3868000754B65 /* default */ = { isa = PBXGroup; children = ( - B0056DDD11F3868000754B65 /* background.png */, - B0056DDE11F3868000754B65 /* boot.png */, - B0056DDF11F3868000754B65 /* device_cdrom.png */, - B0056DE011F3868000754B65 /* device_ext3.png */, - B0056DE111F3868000754B65 /* device_fat16.png */, - B0056DE211F3868000754B65 /* device_fat32.png */, - B0056DE311F3868000754B65 /* device_generic.png */, - B0056DE411F3868000754B65 /* device_hfsplus.png */, - B0056DE511F3868000754B65 /* device_ntfs.png */, - B0056DE611F3868000754B65 /* device_scroll_next.png */, - B0056DE711F3868000754B65 /* device_scroll_prev.png */, - B0056DE811F3868000754B65 /* device_selection.png */, - B0056DE911F3868000754B65 /* font_console.png */, - B0056DEA11F3868000754B65 /* font_small.png */, - B0056DEB11F3868000754B65 /* logo.png */, - B0056DEC11F3868000754B65 /* menu_boot.png */, - B0056DED11F3868000754B65 /* menu_help.png */, - B0056DEE11F3868000754B65 /* menu_ignore_caches.png */, - B0056DEF11F3868000754B65 /* menu_ignore_caches_disabled.png */, - B0056DF011F3868000754B65 /* menu_memory_info.png */, - B0056DF111F3868000754B65 /* menu_selection.png */, - B0056DF211F3868000754B65 /* menu_single_user.png */, - B0056DF311F3868000754B65 /* menu_single_user_disabled.png */, - B0056DF411F3868000754B65 /* menu_verbose.png */, - B0056DF511F3868000754B65 /* menu_verbose_disabled.png */, - B0056DF611F3868000754B65 /* menu_video_info.png */, - B0056DF711F3868000754B65 /* progress_bar.png */, - B0056DF811F3868000754B65 /* progress_bar_background.png */, - B0056DF911F3868000754B65 /* text_scroll_next.png */, - B0056DFA11F3868000754B65 /* text_scroll_prev.png */, - B0056DFB11F3868000754B65 /* theme.plist */, + 36AB75A114BD0866005B8045 /* background.png */, + 36AB75A214BD0866005B8045 /* boot.png */, + 36AB75A314BD0866005B8045 /* device_befs_o.png */, + 36AB75A414BD0866005B8045 /* device_befs.png */, + 36AB75A514BD0866005B8045 /* device_cdrom_o.png */, + 36AB75A614BD0866005B8045 /* device_cdrom.png */, + 36AB75A714BD0866005B8045 /* device_ext3_o.png */, + 36AB75A814BD0866005B8045 /* device_ext3.png */, + 36AB75A914BD0866005B8045 /* device_fat_o.png */, + 36AB75AA14BD0866005B8045 /* device_fat.png */, + 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */, + 36AB75AC14BD0866005B8045 /* device_freebsd.png */, + 36AB75AD14BD0866005B8045 /* device_generic_o.png */, + 36AB75AE14BD0866005B8045 /* device_generic.png */, + 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */, + 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, + 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, + 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, + 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */, + 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */, + 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */, + 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */, + 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */, + 36AB75B814BD0866005B8045 /* device_hfsplus.png */, + 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */, + 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, + 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, + 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, + 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */, + 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */, + 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */, + 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */, + 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */, + 36AB75C214BD0866005B8045 /* device_hfsraid.png */, + 36AB75C314BD0866005B8045 /* device_ntfs_o.png */, + 36AB75C414BD0866005B8045 /* device_ntfs.png */, + 36AB75C514BD0866005B8045 /* device_openbsd_o.png */, + 36AB75C614BD0866005B8045 /* device_openbsd.png */, + 36AB75C714BD0866005B8045 /* device_scroll_next.png */, + 36AB75C814BD0866005B8045 /* device_scroll_prev.png */, + 36AB75C914BD0866005B8045 /* device_selection.png */, + 36AB75CA14BD0866005B8045 /* font_console.png */, + 36AB75CB14BD0866005B8045 /* font_small.png */, + 36AB75CC14BD0866005B8045 /* logo.png */, + 36AB75CD14BD0866005B8045 /* menu_boot.png */, + 36AB75CE14BD0866005B8045 /* menu_help.png */, + 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */, + 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */, + 36AB75D114BD0866005B8045 /* menu_memory_info.png */, + 36AB75D214BD0866005B8045 /* menu_selection.png */, + 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */, + 36AB75D414BD0866005B8045 /* menu_single_user.png */, + 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */, + 36AB75D614BD0866005B8045 /* menu_verbose.png */, + 36AB75D714BD0866005B8045 /* menu_video_info.png */, + 36AB75D814BD0866005B8045 /* progress_bar_background.png */, + 36AB75D914BD0866005B8045 /* progress_bar.png */, + 36AB75DA14BD0866005B8045 /* text_scroll_next.png */, + 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */, + 36AB75DC14BD0866005B8045 /* theme.plist */, + 36AB75DD14BD0866005B8045 /* thumb.png */, ); path = default; sourceTree = ""; @@ -3157,22 +3304,43 @@ developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( - English, - Japanese, - French, - German, - Spanish, + ar, + bg, + bs, + ca, + cs, + da, de, + el, en, es, + fi, fr, - "hr-HR", + he, + hr, + hu, id, it, + ja, + ko, + mk, + ms, + nl, + no, pl, "pt-BR", "pt-PT", + ro, + ru, + sk, sr, + sv, + th, + tr, + uk, + vi, + zh_CN, + zh_TW, ); mainGroup = 08FB7794FE84155DC02AAC07 /* Chameleon */; projectDirPath = ""; @@ -3187,17 +3355,29 @@ A37D7D4B141B7C6F0069C38B /* Conclusion.rtfd */ = { isa = PBXVariantGroup; children = ( + A34125FD14BA3ED3002C359C /* ar */, + A34125FE14BA3EE8002C359C /* bg */, + A34125FF14BA3F3D002C359C /* bs */, + A341260014BA3F3D002C359C /* el */, A37D7D55141B7C6F0069C38B /* en */, A37D7D4C141B7C6F0069C38B /* de */, A37D7D5A141B7C6F0069C38B /* es */, A37D7D5F141B7C6F0069C38B /* fr */, - A37D7D64141B7C6F0069C38B /* hr-HR */, + A341260114BA3F3D002C359C /* he */, + A341260214BA3F3D002C359C /* hr */, A37D7D69141B7C6F0069C38B /* id */, A37D7D6E141B7C6F0069C38B /* it */, + A341260314BA3F3D002C359C /* ja */, + A341260414BA3F3D002C359C /* ko */, + A341260514BA3F3D002C359C /* mk */, + A341260614BA3F3D002C359C /* nl */, A37D7D73141B7C6F0069C38B /* pl */, A37D7D78141B7C6F0069C38B /* pt-BR */, A37D7D7D141B7C6F0069C38B /* pt-PT */, + A341260714BA3F3D002C359C /* ru */, A37D7D82141B7C6F0069C38B /* sr */, + A341260814BA3F3D002C359C /* zh_CN */, + A341260914BA3F3D002C359C /* zh_TW */, ); name = Conclusion.rtfd; sourceTree = ""; @@ -3209,7 +3389,7 @@ A37D7D56141B7C6F0069C38B /* en */, A37D7D5B141B7C6F0069C38B /* es */, A37D7D60141B7C6F0069C38B /* fr */, - A37D7D65141B7C6F0069C38B /* hr-HR */, + A37D7D65141B7C6F0069C38B /* hr */, A37D7D6A141B7C6F0069C38B /* id */, A37D7D6F141B7C6F0069C38B /* it */, A37D7D74141B7C6F0069C38B /* pl */, @@ -3227,7 +3407,7 @@ A37D7D57141B7C6F0069C38B /* en */, A37D7D5C141B7C6F0069C38B /* es */, A37D7D61141B7C6F0069C38B /* fr */, - A37D7D66141B7C6F0069C38B /* hr-HR */, + A37D7D66141B7C6F0069C38B /* hr */, A37D7D6B141B7C6F0069C38B /* id */, A37D7D70141B7C6F0069C38B /* it */, A37D7D75141B7C6F0069C38B /* pl */, @@ -3245,7 +3425,7 @@ A37D7D52141B7C6F0069C38B /* de */, A37D7D5D141B7C6F0069C38B /* es */, A37D7D62141B7C6F0069C38B /* fr */, - A37D7D67141B7C6F0069C38B /* hr-HR */, + A37D7D67141B7C6F0069C38B /* hr */, A37D7D6C141B7C6F0069C38B /* id */, A37D7D71141B7C6F0069C38B /* it */, A37D7D76141B7C6F0069C38B /* pl */, @@ -3259,17 +3439,29 @@ A37D7D53141B7C6F0069C38B /* Welcome.rtfd */ = { isa = PBXVariantGroup; children = ( + A3AECAA414BCB71F0059212A /* ar */, + A3AECAA514BCB71F0059212A /* bg */, + A3AECAA614BCB71F0059212A /* bs */, + A37D7D54141B7C6F0069C38B /* de */, + A3AECAA714BCB73D0059212A /* el */, A37D7D59141B7C6F0069C38B /* en */, - A37D7D54141B7C6F0069C38B /* de */, A37D7D5E141B7C6F0069C38B /* es */, A37D7D63141B7C6F0069C38B /* fr */, - A37D7D68141B7C6F0069C38B /* hr-HR */, + A3AECAA814BCB73D0059212A /* he */, + A3AECAA914BCB73D0059212A /* hr */, A37D7D6D141B7C6F0069C38B /* id */, A37D7D72141B7C6F0069C38B /* it */, + A3AECAAA14BCB7BE0059212A /* ja */, + A3AECAAB14BCB7BE0059212A /* ko */, + A3AECAAC14BCB7BE0059212A /* mk */, + A3AECAAD14BCB7E10059212A /* nl */, A37D7D77141B7C6F0069C38B /* pl */, A37D7D7C141B7C6F0069C38B /* pt-BR */, A37D7D81141B7C6F0069C38B /* pt-PT */, + A3AECAAE14BCB7E10059212A /* ru */, A37D7D86141B7C6F0069C38B /* sr */, + A3AECAAF14BCB7E10059212A /* zh_CN */, + A3AECAB014BCB7E10059212A /* zh_TW */, ); name = Welcome.rtfd; sourceTree = ""; Index: branches/ErmaC/Trunk/package/Scripts.templates/Pre/preinstall =================================================================== --- branches/ErmaC/Trunk/package/Scripts.templates/Pre/preinstall (revision 1788) +++ branches/ErmaC/Trunk/package/Scripts.templates/Pre/preinstall (revision 1789) @@ -7,16 +7,14 @@ echo "" # Creates text file named '@LOG_FILENAME@' -# at the root of the target volume. This is to give the user +# at the root of the target volume. This is to give the user # a record of the installation process and also to show why # possibly the installation process failed (even though the -# package installer ends reading 'Installation Successful'. +# package installer ends reading 'Installation Successful'). # This script also prepares, then backs up any previous # stage2 boot file, /Extra folder and install log if they exist. - - # Find location of this script in the package installer # so we know where all the other scripts are located. @@ -41,13 +39,14 @@ # Preparing Backing up of Chameleon files # --------------------------------------------- backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" ) -if [[ -f "$logFile" ]];then - # Only make backupDir if required + +# Only make backupDir if required +if [[ ! -d "$backupDir" && \ + ( -f "$logFile" || -f "${targetVolume}/boot" || -d "${targetVolume}/Extra" ) ]];then mkdir -p "$backupDir" - # Backup old log file - mv "$logFile" "${backupDir}/${logName}" fi +[[ -f "$logFile" ]] && mv "$logFile" "${backupDir}/${logName}" # Backup old log file # Setup Chameleon Log file # by writing header and diskutil list @@ -62,22 +61,20 @@ # --------------------------------------------- # Backing up Chameleon files # --------------------------------------------- -if [[ -f "${targetVolume}/boot" ]] || [[ -d "${targetVolume}/Extra" ]];then - if [[ ! -d "$backupDir" ]];then - mkdir -p "$backupDir" - fi - # Backup stage2 - if [[ -f "${targetVolume}/boot" ]];then - echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" - cp -p "${targetVolume}/boot" "${backupDir}/boot" - fi - # Backup /Extra directory - if [[ -d "${targetVolume}/Extra" ]];then - echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" - cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" - fi - chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups - echo "======================================================" >>"${logFile}" +if [[ -d "$backupDir" ]];then + # Backup stage2 + if [[ -f "${targetVolume}/boot" ]];then + echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" + cp -p "${targetVolume}/boot" "${backupDir}/boot" + fi + # Backup /Extra directory + if [[ -d "${targetVolume}/Extra" ]];then + echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" + cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" + fi + + chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups + echo "======================================================" >>"${logFile}" fi echo "===============================================" Index: branches/ErmaC/Trunk/package/buildpkg.sh =================================================================== --- branches/ErmaC/Trunk/package/buildpkg.sh (revision 1788) +++ branches/ErmaC/Trunk/package/buildpkg.sh (revision 1789) @@ -166,11 +166,9 @@ $ownSubst" for file in "$@";do - if [[ ! $file == *.svn* ]]; then - cp -pf "$file" "${file}.in" - sed "$allSubst" "${file}.in" > "${file}" - rm -f "${file}.in" - fi + cp -pf "$file" "${file}.in" + sed "$allSubst" "${file}.in" > "${file}" + rm -f "${file}.in" done } @@ -403,7 +401,7 @@ addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build pre install package @@ -426,7 +424,7 @@ ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build core package @@ -441,7 +439,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" addChoice --group="InstallType" --start-selected="!choices['Upgrade'].selected" --pkg-refs="$packageRefId" "${choiceId}" # End build new install package @@ -451,7 +449,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" addChoice --group="InstallType" --start-selected="chameleon_boot_plist_exists()" --pkg-refs="$packageRefId" "${choiceId}" # End build upgrade package @@ -471,7 +469,7 @@ ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build standard package @@ -485,7 +483,7 @@ ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-visible="systemHasGPT()" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build efi package @@ -494,7 +492,7 @@ mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build no bootloader choice package @@ -524,7 +522,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build klibc package module } @@ -544,7 +542,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # Add the klibc package because the uClibc module is dependent of klibc module addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}" # End build uClibc package module @@ -560,7 +558,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build Resolution package module } @@ -588,7 +586,7 @@ ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # Don't add a choice for Keylayout module # addChoice "${choiceId}" "Module" --start-selected="false" "$packageRefId" @@ -663,7 +661,7 @@ echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}" packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}") - buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1 + buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" addChoice --group="${builtOptionsList}" \ --start-selected="check_chameleon_option('$key','$value')" \ --pkg-refs="$packageRefId" "${optionName}" @@ -700,7 +698,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" # Add the Keylayout package because the Keylayout module is needed addChoice --group="KeyLayout" \ --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \ @@ -724,7 +722,7 @@ rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}" packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}") - buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1 + buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" addChoice --group="Themes" --start-selected="false" --pkg-refs="$packageRefId" "${theme}" done # End build theme packages# End build Extras package @@ -738,7 +736,7 @@ cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build post install package Index: branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1788) +++ branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1789) @@ -19,6 +19,79 @@ 1D2A1AF513743A2600787720 /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; sourceTree = ""; }; 26F2051D13D04B060020D229 /* exfat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = exfat.h; sourceTree = ""; }; 26F2052013D04B130020D229 /* exfat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exfat.c; sourceTree = ""; }; + 369689D014BD0AF10013D77F /* BLOCKERS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BLOCKERS; sourceTree = ""; }; + 369689D114BD0AF10013D77F /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + 369689D214BD0B470013D77F /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; + 36AB75A114BD0866005B8045 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + 36AB75A214BD0866005B8045 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + 36AB75A314BD0866005B8045 /* device_befs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o.png; sourceTree = ""; }; + 36AB75A414BD0866005B8045 /* device_befs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs.png; sourceTree = ""; }; + 36AB75A514BD0866005B8045 /* device_cdrom_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom_o.png; sourceTree = ""; }; + 36AB75A614BD0866005B8045 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + 36AB75A714BD0866005B8045 /* device_ext3_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o.png; sourceTree = ""; }; + 36AB75A814BD0866005B8045 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + 36AB75A914BD0866005B8045 /* device_fat_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat_o.png; sourceTree = ""; }; + 36AB75AA14BD0866005B8045 /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o.png; sourceTree = ""; }; + 36AB75AC14BD0866005B8045 /* device_freebsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd.png; sourceTree = ""; }; + 36AB75AD14BD0866005B8045 /* device_generic_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic_o.png; sourceTree = ""; }; + 36AB75AE14BD0866005B8045 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo_o.png; sourceTree = ""; }; + 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo.png; sourceTree = ""; }; + 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o.png; sourceTree = ""; }; + 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion.png; sourceTree = ""; }; + 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_o.png; sourceTree = ""; }; + 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o.png; sourceTree = ""; }; + 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl.png; sourceTree = ""; }; + 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger_o.png; sourceTree = ""; }; + 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger.png; sourceTree = ""; }; + 36AB75B814BD0866005B8045 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo_o.png; sourceTree = ""; }; + 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo.png; sourceTree = ""; }; + 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o.png; sourceTree = ""; }; + 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion.png; sourceTree = ""; }; + 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_o.png; sourceTree = ""; }; + 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o.png; sourceTree = ""; }; + 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl.png; sourceTree = ""; }; + 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger_o.png; sourceTree = ""; }; + 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger.png; sourceTree = ""; }; + 36AB75C214BD0866005B8045 /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; + 36AB75C314BD0866005B8045 /* device_ntfs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o.png; sourceTree = ""; }; + 36AB75C414BD0866005B8045 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + 36AB75C514BD0866005B8045 /* device_openbsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o.png; sourceTree = ""; }; + 36AB75C614BD0866005B8045 /* device_openbsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd.png; sourceTree = ""; }; + 36AB75C714BD0866005B8045 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + 36AB75C814BD0866005B8045 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + 36AB75C914BD0866005B8045 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + 36AB75CA14BD0866005B8045 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + 36AB75CB14BD0866005B8045 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + 36AB75CC14BD0866005B8045 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + 36AB75CD14BD0866005B8045 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + 36AB75CE14BD0866005B8045 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + 36AB75D114BD0866005B8045 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + 36AB75D214BD0866005B8045 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + 36AB75D414BD0866005B8045 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + 36AB75D614BD0866005B8045 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + 36AB75D714BD0866005B8045 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + 36AB75D814BD0866005B8045 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + 36AB75D914BD0866005B8045 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + 36AB75DA14BD0866005B8045 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + 36AB75DC14BD0866005B8045 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + 36AB75DD14BD0866005B8045 /* thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb.png; sourceTree = ""; }; + 36AB75E114BD091C005B8045 /* InstallLog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = InstallLog.sh; sourceTree = ""; }; + 36AB75E314BD0925005B8045 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + 36AB75E414BD092D005B8045 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = preinstall; sourceTree = ""; }; + 36AB75E514BD095E005B8045 /* Control.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Control.txt; path = OptionalSettings/Control.txt; sourceTree = ""; }; + 36AB75E614BD095E005B8045 /* General.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = General.txt; path = OptionalSettings/General.txt; sourceTree = ""; }; + 36AB75E714BD095E005B8045 /* KernelFlags.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = KernelFlags.txt; path = OptionalSettings/KernelFlags.txt; sourceTree = ""; }; + 36AB75E814BD095E005B8045 /* PowerManagement.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PowerManagement.txt; path = OptionalSettings/PowerManagement.txt; sourceTree = ""; }; + 36AB75E914BD095E005B8045 /* Resolution.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Resolution.txt; path = OptionalSettings/Resolution.txt; sourceTree = ""; }; + 36AB75EA14BD095E005B8045 /* Video.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Video.txt; path = OptionalSettings/Video.txt; sourceTree = ""; }; 65ED53931204B83200B22507 /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = ""; }; 6DBAFD1313B0D21E0047ED33 /* modules_support.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = modules_support.s; sourceTree = ""; }; 6DBAFD1413B0D21E0047ED33 /* modules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modules.c; sourceTree = ""; }; @@ -651,9 +724,20 @@ 6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = ""; }; 6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = ""; }; 6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = ""; }; + A34125FD14BA3ED3002C359C /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; + A34125FE14BA3EE8002C359C /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Conclusion.rtfd; sourceTree = ""; }; + A34125FF14BA3F3D002C359C /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260014BA3F3D002C359C /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260114BA3F3D002C359C /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260214BA3F3D002C359C /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260314BA3F3D002C359C /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260414BA3F3D002C359C /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260514BA3F3D002C359C /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260614BA3F3D002C359C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260714BA3F3D002C359C /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260814BA3F3D002C359C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Conclusion.rtfd; sourceTree = ""; }; + A341260914BA3F3D002C359C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Conclusion.rtfd; sourceTree = ""; }; A354B6271495124F00D81AA5 /* ESPpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ESPpostinstall; sourceTree = ""; }; - A354B6281495124F00D81AA5 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - A354B6291495124F00D81AA5 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = preinstall; sourceTree = ""; }; A354B62A1495124F00D81AA5 /* Standardpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Standardpostinstall; sourceTree = ""; }; A354B62C149514DE00D81AA5 /* CheckDiskMicrocode.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckDiskMicrocode.sh; sourceTree = ""; }; A354B62D149514DE00D81AA5 /* CheckFatType.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckFatType.sh; sourceTree = ""; }; @@ -662,7 +746,6 @@ A354B630149514DE00D81AA5 /* CheckPreviousChameleon.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckPreviousChameleon.sh; sourceTree = ""; }; A354B631149514DE00D81AA5 /* CheckProceed.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckProceed.sh; sourceTree = ""; }; A354B632149514DE00D81AA5 /* CheckWindowsDiskSignature.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckWindowsDiskSignature.sh; sourceTree = ""; }; - A354B633149514DE00D81AA5 /* InstallLog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = InstallLog.sh; sourceTree = ""; }; A354B634149514DE00D81AA5 /* MountESP.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = MountESP.sh; sourceTree = ""; }; A354B635149514DE00D81AA5 /* patch */ = {isa = PBXFileReference; lastKnownFileType = file; path = patch; sourceTree = ""; }; A354B636149514DE00D81AA5 /* SetActivePartition.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = SetActivePartition.sh; sourceTree = ""; }; @@ -935,11 +1018,11 @@ A37D7D61141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/License.rtf; sourceTree = ""; }; A37D7D62141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D63141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = fr; path = fr.lproj/Welcome.rtfd; sourceTree = ""; }; - A37D7D64141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Conclusion.rtfd"; sourceTree = ""; }; - A37D7D65141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "hr-HR"; path = "hr-HR.lproj/Description.html"; sourceTree = ""; }; - A37D7D66141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "hr-HR"; path = "hr-HR.lproj/License.rtf"; sourceTree = ""; }; - A37D7D67141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr-HR"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; - A37D7D68141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Welcome.rtfd"; sourceTree = ""; }; + A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = hr; path = "hr.lproj/Description.html"; sourceTree = ""; }; + A37D7D66141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = hr; path = "hr.lproj/License.rtf"; sourceTree = ""; }; + A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; + A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; A37D7D69141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = id; path = id.lproj/Conclusion.rtfd; sourceTree = ""; }; A37D7D6A141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = id; path = id.lproj/Description.html; sourceTree = ""; }; A37D7D6B141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = id; path = id.lproj/License.rtf; sourceTree = ""; }; @@ -970,6 +1053,19 @@ A37D7D84141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = sr; path = sr.lproj/License.rtf; sourceTree = ""; }; A37D7D85141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D86141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = sr; path = sr.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA414BCB71F0059212A /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA514BCB71F0059212A /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA614BCB71F0059212A /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA714BCB73D0059212A /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA814BCB73D0059212A /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAA914BCB73D0059212A /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAA14BCB7BE0059212A /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAB14BCB7BE0059212A /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAC14BCB7BE0059212A /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAD14BCB7E10059212A /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAE14BCB7E10059212A /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAAF14BCB7E10059212A /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Welcome.rtfd; sourceTree = ""; }; + A3AECAB014BCB7E10059212A /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Welcome.rtfd; sourceTree = ""; }; A3F1F267141B9B3B00DDA709 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; @@ -1143,37 +1239,6 @@ B0056DD911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; B0056DDA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; B0056DDB11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; - B0056DDD11F3868000754B65 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; - B0056DDE11F3868000754B65 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; - B0056DDF11F3868000754B65 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; - B0056DE011F3868000754B65 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; - B0056DE111F3868000754B65 /* device_fat16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat16.png; sourceTree = ""; }; - B0056DE211F3868000754B65 /* device_fat32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat32.png; sourceTree = ""; }; - B0056DE311F3868000754B65 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; - B0056DE411F3868000754B65 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; - B0056DE511F3868000754B65 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; - B0056DE611F3868000754B65 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; - B0056DE711F3868000754B65 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; - B0056DE811F3868000754B65 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; - B0056DE911F3868000754B65 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; - B0056DEA11F3868000754B65 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; - B0056DEB11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - B0056DEC11F3868000754B65 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; - B0056DED11F3868000754B65 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; - B0056DEE11F3868000754B65 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; - B0056DEF11F3868000754B65 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; - B0056DF011F3868000754B65 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; - B0056DF111F3868000754B65 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; - B0056DF211F3868000754B65 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; - B0056DF311F3868000754B65 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; - B0056DF411F3868000754B65 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; - B0056DF511F3868000754B65 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; - B0056DF611F3868000754B65 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; - B0056DF711F3868000754B65 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; - B0056DF811F3868000754B65 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; - B0056DF911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; - B0056DFA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; - B0056DFB11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056DFD11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; B0056DFE11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056E0011F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; @@ -1209,24 +1274,77 @@ 08FB7794FE84155DC02AAC07 /* Chameleon */ = { isa = PBXGroup; children = ( + B0056D8211F3868000754B65 /* APPLE_LICENSE */, B0056DBA11F3868000754B65 /* artwork */, + 369689D014BD0AF10013D77F /* BLOCKERS */, + 369689D114BD0AF10013D77F /* Cconfig */, + B0056D8111F3868000754B65 /* CHANGES */, + B0056D8011F3868000754B65 /* coding_standards.txt */, + B0056D7F11F3868000754B65 /* CREDITS */, B0056E0611F3868000754B65 /* doc */, + B0146F0011FDEFB90010765C /* GPL_V2_LICENSE */, B0056CE511F3868000754B65 /* i386 */, + A360AA7D14136C1A00084D3F /* Make.rules */, + B0056D7D11F3868000754B65 /* Makefile */, + 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */, B0056D8311F3868000754B65 /* package */, - B0056D8211F3868000754B65 /* APPLE_LICENSE */, - B0056D7F11F3868000754B65 /* CREDITS */, - B0056D8111F3868000754B65 /* CHANGES */, - B0146F0011FDEFB90010765C /* GPL_V2_LICENSE */, B0146EFF11FDEF550010765C /* README */, - 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */, B0056D7C11F3868000754B65 /* TODO */, - B0056D7D11F3868000754B65 /* Makefile */, - A360AA7D14136C1A00084D3F /* Make.rules */, - B0056D8011F3868000754B65 /* coding_standards.txt */, + 369689D214BD0B470013D77F /* version */, ); name = Chameleon; sourceTree = ""; }; + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = { + isa = PBXGroup; + children = ( + 364E0DE114BCFB7A00F55E58 /* InstallerLog */, + 364E0DE314BCFB7A00F55E58 /* Post */, + 364E0DE514BCFB7A00F55E58 /* Pre */, + ); + name = Scripts.templates; + sourceTree = ""; + }; + 364E0DE114BCFB7A00F55E58 /* InstallerLog */ = { + isa = PBXGroup; + children = ( + 36AB75E114BD091C005B8045 /* InstallLog.sh */, + ); + name = InstallerLog; + path = Scripts.templates/InstallerLog; + sourceTree = ""; + }; + 364E0DE314BCFB7A00F55E58 /* Post */ = { + isa = PBXGroup; + children = ( + 36AB75E314BD0925005B8045 /* postinstall */, + ); + name = Post; + path = Scripts.templates/Post; + sourceTree = ""; + }; + 364E0DE514BCFB7A00F55E58 /* Pre */ = { + isa = PBXGroup; + children = ( + 36AB75E414BD092D005B8045 /* preinstall */, + ); + name = Pre; + path = Scripts.templates/Pre; + sourceTree = ""; + }; + 36B43E8114BCE91300D29461 /* OptionalSettings */ = { + isa = PBXGroup; + children = ( + 36AB75E514BD095E005B8045 /* Control.txt */, + 36AB75E614BD095E005B8045 /* General.txt */, + 36AB75E714BD095E005B8045 /* KernelFlags.txt */, + 36AB75E814BD095E005B8045 /* PowerManagement.txt */, + 36AB75E914BD095E005B8045 /* Resolution.txt */, + 36AB75EA14BD095E005B8045 /* Video.txt */, + ); + name = OptionalSettings; + sourceTree = ""; + }; 6DBAFD1713B0D4590047ED33 /* include */ = { isa = PBXGroup; children = ( @@ -2330,8 +2448,6 @@ isa = PBXGroup; children = ( A354B6271495124F00D81AA5 /* ESPpostinstall */, - A354B6281495124F00D81AA5 /* postinstall */, - A354B6291495124F00D81AA5 /* preinstall */, A354B62A1495124F00D81AA5 /* Standardpostinstall */, ); path = Main; @@ -2347,7 +2463,6 @@ A354B630149514DE00D81AA5 /* CheckPreviousChameleon.sh */, A354B631149514DE00D81AA5 /* CheckProceed.sh */, A354B632149514DE00D81AA5 /* CheckWindowsDiskSignature.sh */, - A354B633149514DE00D81AA5 /* InstallLog.sh */, A354B634149514DE00D81AA5 /* MountESP.sh */, A354B635149514DE00D81AA5 /* patch */, A354B636149514DE00D81AA5 /* SetActivePartition.sh */, @@ -2951,6 +3066,8 @@ B0056D8311F3868000754B65 /* package */ = { isa = PBXGroup; children = ( + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */, + 36B43E8114BCE91300D29461 /* OptionalSettings */, A35D2187141A75DC00969AC0 /* slimpkg.sh */, A35D2188141A75DC00969AC0 /* buildpkg.sh */, A35D2189141A75DC00969AC0 /* builddmg.sh */, @@ -3023,37 +3140,67 @@ B0056DDC11F3868000754B65 /* default */ = { isa = PBXGroup; children = ( - B0056DDD11F3868000754B65 /* background.png */, - B0056DDE11F3868000754B65 /* boot.png */, - B0056DDF11F3868000754B65 /* device_cdrom.png */, - B0056DE011F3868000754B65 /* device_ext3.png */, - B0056DE111F3868000754B65 /* device_fat16.png */, - B0056DE211F3868000754B65 /* device_fat32.png */, - B0056DE311F3868000754B65 /* device_generic.png */, - B0056DE411F3868000754B65 /* device_hfsplus.png */, - B0056DE511F3868000754B65 /* device_ntfs.png */, - B0056DE611F3868000754B65 /* device_scroll_next.png */, - B0056DE711F3868000754B65 /* device_scroll_prev.png */, - B0056DE811F3868000754B65 /* device_selection.png */, - B0056DE911F3868000754B65 /* font_console.png */, - B0056DEA11F3868000754B65 /* font_small.png */, - B0056DEB11F3868000754B65 /* logo.png */, - B0056DEC11F3868000754B65 /* menu_boot.png */, - B0056DED11F3868000754B65 /* menu_help.png */, - B0056DEE11F3868000754B65 /* menu_ignore_caches.png */, - B0056DEF11F3868000754B65 /* menu_ignore_caches_disabled.png */, - B0056DF011F3868000754B65 /* menu_memory_info.png */, - B0056DF111F3868000754B65 /* menu_selection.png */, - B0056DF211F3868000754B65 /* menu_single_user.png */, - B0056DF311F3868000754B65 /* menu_single_user_disabled.png */, - B0056DF411F3868000754B65 /* menu_verbose.png */, - B0056DF511F3868000754B65 /* menu_verbose_disabled.png */, - B0056DF611F3868000754B65 /* menu_video_info.png */, - B0056DF711F3868000754B65 /* progress_bar.png */, - B0056DF811F3868000754B65 /* progress_bar_background.png */, - B0056DF911F3868000754B65 /* text_scroll_next.png */, - B0056DFA11F3868000754B65 /* text_scroll_prev.png */, - B0056DFB11F3868000754B65 /* theme.plist */, + 36AB75A114BD0866005B8045 /* background.png */, + 36AB75A214BD0866005B8045 /* boot.png */, + 36AB75A314BD0866005B8045 /* device_befs_o.png */, + 36AB75A414BD0866005B8045 /* device_befs.png */, + 36AB75A514BD0866005B8045 /* device_cdrom_o.png */, + 36AB75A614BD0866005B8045 /* device_cdrom.png */, + 36AB75A714BD0866005B8045 /* device_ext3_o.png */, + 36AB75A814BD0866005B8045 /* device_ext3.png */, + 36AB75A914BD0866005B8045 /* device_fat_o.png */, + 36AB75AA14BD0866005B8045 /* device_fat.png */, + 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */, + 36AB75AC14BD0866005B8045 /* device_freebsd.png */, + 36AB75AD14BD0866005B8045 /* device_generic_o.png */, + 36AB75AE14BD0866005B8045 /* device_generic.png */, + 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */, + 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, + 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, + 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, + 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */, + 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */, + 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */, + 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */, + 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */, + 36AB75B814BD0866005B8045 /* device_hfsplus.png */, + 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */, + 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, + 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, + 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, + 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */, + 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */, + 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */, + 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */, + 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */, + 36AB75C214BD0866005B8045 /* device_hfsraid.png */, + 36AB75C314BD0866005B8045 /* device_ntfs_o.png */, + 36AB75C414BD0866005B8045 /* device_ntfs.png */, + 36AB75C514BD0866005B8045 /* device_openbsd_o.png */, + 36AB75C614BD0866005B8045 /* device_openbsd.png */, + 36AB75C714BD0866005B8045 /* device_scroll_next.png */, + 36AB75C814BD0866005B8045 /* device_scroll_prev.png */, + 36AB75C914BD0866005B8045 /* device_selection.png */, + 36AB75CA14BD0866005B8045 /* font_console.png */, + 36AB75CB14BD0866005B8045 /* font_small.png */, + 36AB75CC14BD0866005B8045 /* logo.png */, + 36AB75CD14BD0866005B8045 /* menu_boot.png */, + 36AB75CE14BD0866005B8045 /* menu_help.png */, + 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */, + 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */, + 36AB75D114BD0866005B8045 /* menu_memory_info.png */, + 36AB75D214BD0866005B8045 /* menu_selection.png */, + 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */, + 36AB75D414BD0866005B8045 /* menu_single_user.png */, + 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */, + 36AB75D614BD0866005B8045 /* menu_verbose.png */, + 36AB75D714BD0866005B8045 /* menu_video_info.png */, + 36AB75D814BD0866005B8045 /* progress_bar_background.png */, + 36AB75D914BD0866005B8045 /* progress_bar.png */, + 36AB75DA14BD0866005B8045 /* text_scroll_next.png */, + 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */, + 36AB75DC14BD0866005B8045 /* theme.plist */, + 36AB75DD14BD0866005B8045 /* thumb.png */, ); path = default; sourceTree = ""; @@ -3157,22 +3304,43 @@ developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( - English, - Japanese, - French, - German, - Spanish, + ar, + bg, + bs, + ca, + cs, + da, de, + el, en, es, + fi, fr, - "hr-HR", + he, + hr, + hu, id, it, + ja, + ko, + mk, + ms, + nl, + no, pl, "pt-BR", "pt-PT", + ro, + ru, + sk, sr, + sv, + th, + tr, + uk, + vi, + zh_CN, + zh_TW, ); mainGroup = 08FB7794FE84155DC02AAC07 /* Chameleon */; projectDirPath = ""; @@ -3187,17 +3355,29 @@ A37D7D4B141B7C6F0069C38B /* Conclusion.rtfd */ = { isa = PBXVariantGroup; children = ( + A34125FD14BA3ED3002C359C /* ar */, + A34125FE14BA3EE8002C359C /* bg */, + A34125FF14BA3F3D002C359C /* bs */, + A341260014BA3F3D002C359C /* el */, A37D7D55141B7C6F0069C38B /* en */, A37D7D4C141B7C6F0069C38B /* de */, A37D7D5A141B7C6F0069C38B /* es */, A37D7D5F141B7C6F0069C38B /* fr */, - A37D7D64141B7C6F0069C38B /* hr-HR */, + A341260114BA3F3D002C359C /* he */, + A341260214BA3F3D002C359C /* hr */, A37D7D69141B7C6F0069C38B /* id */, A37D7D6E141B7C6F0069C38B /* it */, + A341260314BA3F3D002C359C /* ja */, + A341260414BA3F3D002C359C /* ko */, + A341260514BA3F3D002C359C /* mk */, + A341260614BA3F3D002C359C /* nl */, A37D7D73141B7C6F0069C38B /* pl */, A37D7D78141B7C6F0069C38B /* pt-BR */, A37D7D7D141B7C6F0069C38B /* pt-PT */, + A341260714BA3F3D002C359C /* ru */, A37D7D82141B7C6F0069C38B /* sr */, + A341260814BA3F3D002C359C /* zh_CN */, + A341260914BA3F3D002C359C /* zh_TW */, ); name = Conclusion.rtfd; sourceTree = ""; @@ -3209,7 +3389,7 @@ A37D7D56141B7C6F0069C38B /* en */, A37D7D5B141B7C6F0069C38B /* es */, A37D7D60141B7C6F0069C38B /* fr */, - A37D7D65141B7C6F0069C38B /* hr-HR */, + A37D7D65141B7C6F0069C38B /* hr */, A37D7D6A141B7C6F0069C38B /* id */, A37D7D6F141B7C6F0069C38B /* it */, A37D7D74141B7C6F0069C38B /* pl */, @@ -3227,7 +3407,7 @@ A37D7D57141B7C6F0069C38B /* en */, A37D7D5C141B7C6F0069C38B /* es */, A37D7D61141B7C6F0069C38B /* fr */, - A37D7D66141B7C6F0069C38B /* hr-HR */, + A37D7D66141B7C6F0069C38B /* hr */, A37D7D6B141B7C6F0069C38B /* id */, A37D7D70141B7C6F0069C38B /* it */, A37D7D75141B7C6F0069C38B /* pl */, @@ -3245,7 +3425,7 @@ A37D7D52141B7C6F0069C38B /* de */, A37D7D5D141B7C6F0069C38B /* es */, A37D7D62141B7C6F0069C38B /* fr */, - A37D7D67141B7C6F0069C38B /* hr-HR */, + A37D7D67141B7C6F0069C38B /* hr */, A37D7D6C141B7C6F0069C38B /* id */, A37D7D71141B7C6F0069C38B /* it */, A37D7D76141B7C6F0069C38B /* pl */, @@ -3259,17 +3439,29 @@ A37D7D53141B7C6F0069C38B /* Welcome.rtfd */ = { isa = PBXVariantGroup; children = ( + A3AECAA414BCB71F0059212A /* ar */, + A3AECAA514BCB71F0059212A /* bg */, + A3AECAA614BCB71F0059212A /* bs */, + A37D7D54141B7C6F0069C38B /* de */, + A3AECAA714BCB73D0059212A /* el */, A37D7D59141B7C6F0069C38B /* en */, - A37D7D54141B7C6F0069C38B /* de */, A37D7D5E141B7C6F0069C38B /* es */, A37D7D63141B7C6F0069C38B /* fr */, - A37D7D68141B7C6F0069C38B /* hr-HR */, + A3AECAA814BCB73D0059212A /* he */, + A3AECAA914BCB73D0059212A /* hr */, A37D7D6D141B7C6F0069C38B /* id */, A37D7D72141B7C6F0069C38B /* it */, + A3AECAAA14BCB7BE0059212A /* ja */, + A3AECAAB14BCB7BE0059212A /* ko */, + A3AECAAC14BCB7BE0059212A /* mk */, + A3AECAAD14BCB7E10059212A /* nl */, A37D7D77141B7C6F0069C38B /* pl */, A37D7D7C141B7C6F0069C38B /* pt-BR */, A37D7D81141B7C6F0069C38B /* pt-PT */, + A3AECAAE14BCB7E10059212A /* ru */, A37D7D86141B7C6F0069C38B /* sr */, + A3AECAAF14BCB7E10059212A /* zh_CN */, + A3AECAB014BCB7E10059212A /* zh_TW */, ); name = Welcome.rtfd; sourceTree = ""; Index: branches/ErmaC/Modules/package/Scripts.templates/Pre/preinstall =================================================================== --- branches/ErmaC/Modules/package/Scripts.templates/Pre/preinstall (revision 1788) +++ branches/ErmaC/Modules/package/Scripts.templates/Pre/preinstall (revision 1789) @@ -7,16 +7,14 @@ echo "" # Creates text file named '@LOG_FILENAME@' -# at the root of the target volume. This is to give the user +# at the root of the target volume. This is to give the user # a record of the installation process and also to show why # possibly the installation process failed (even though the -# package installer ends reading 'Installation Successful'. +# package installer ends reading 'Installation Successful'). # This script also prepares, then backs up any previous # stage2 boot file, /Extra folder and install log if they exist. - - # Find location of this script in the package installer # so we know where all the other scripts are located. @@ -41,13 +39,14 @@ # Preparing Backing up of Chameleon files # --------------------------------------------- backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" ) -if [[ -f "$logFile" ]];then - # Only make backupDir if required + +# Only make backupDir if required +if [[ ! -d "$backupDir" && \ + ( -f "$logFile" || -f "${targetVolume}/boot" || -d "${targetVolume}/Extra" ) ]];then mkdir -p "$backupDir" - # Backup old log file - mv "$logFile" "${backupDir}/${logName}" fi +[[ -f "$logFile" ]] && mv "$logFile" "${backupDir}/${logName}" # Backup old log file # Setup Chameleon Log file # by writing header and diskutil list @@ -62,22 +61,20 @@ # --------------------------------------------- # Backing up Chameleon files # --------------------------------------------- -if [[ -f "${targetVolume}/boot" ]] || [[ -d "${targetVolume}/Extra" ]];then - if [[ ! -d "$backupDir" ]];then - mkdir -p "$backupDir" - fi - # Backup stage2 - if [[ -f "${targetVolume}/boot" ]];then - echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" - cp -p "${targetVolume}/boot" "${backupDir}/boot" - fi - # Backup /Extra directory - if [[ -d "${targetVolume}/Extra" ]];then - echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" - cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" - fi - chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups - echo "======================================================" >>"${logFile}" +if [[ -d "$backupDir" ]];then + # Backup stage2 + if [[ -f "${targetVolume}/boot" ]];then + echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" + cp -p "${targetVolume}/boot" "${backupDir}/boot" + fi + # Backup /Extra directory + if [[ -d "${targetVolume}/Extra" ]];then + echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" + cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" + fi + + chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups + echo "======================================================" >>"${logFile}" fi echo "===============================================" Index: branches/ErmaC/Modules/package/buildpkg.sh =================================================================== --- branches/ErmaC/Modules/package/buildpkg.sh (revision 1788) +++ branches/ErmaC/Modules/package/buildpkg.sh (revision 1789) @@ -170,11 +170,9 @@ $ownSubst" for file in "$@";do - if [[ ! $file == *.svn* ]]; then - cp -pf "$file" "${file}.in" - sed "$allSubst" "${file}.in" > "${file}" - rm -f "${file}.in" - fi + cp -pf "$file" "${file}.in" + sed "$allSubst" "${file}.in" > "${file}" + rm -f "${file}.in" done } @@ -407,7 +405,7 @@ addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build pre install package @@ -430,7 +428,7 @@ ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build core package @@ -445,7 +443,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" addChoice --group="InstallType" --start-selected="!choices['Upgrade'].selected" --pkg-refs="$packageRefId" "${choiceId}" # End build new install package @@ -455,7 +453,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" addChoice --group="InstallType" --start-selected="chameleon_boot_plist_exists()" --pkg-refs="$packageRefId" "${choiceId}" # End build upgrade package @@ -475,7 +473,7 @@ ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build standard package @@ -489,7 +487,7 @@ ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-visible="systemHasGPT()" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build efi package @@ -498,7 +496,7 @@ mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build no bootloader choice package @@ -532,7 +530,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build klibc package module } @@ -552,7 +550,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # Add the klibc package because the uClibc module is dependent of klibc module addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}" # End build uClibc package module @@ -568,7 +566,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build Resolution package module } @@ -596,7 +594,7 @@ ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # Don't add a choice for Keylayout module # addChoice "${choiceId}" "Module" --start-selected="false" "$packageRefId" @@ -614,7 +612,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/AMDGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build AMDGraphicsEnabler package module } @@ -625,12 +623,12 @@ if [[ "${CONFIG_ATIGRAPHICSENABLER_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" ]]; then { # Start build ATiGraphicsEnabler package module - choiceId="AMDGraphicsEnabler" + choiceId="ATiGraphicsEnabler" mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root" ditto --noextattr --noqtn "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" echo -e "\t[BUILD] ${choiceId} " packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build ATiGraphicsEnabler package module } @@ -646,7 +644,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/IntelGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" echo -e "\t[BUILD] ${choiceId} " packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build IntelGraphicsEnabler package module } @@ -662,7 +660,7 @@ ditto --noextattr --noqtn "${SYMROOT}/i386/modules/NVIDIAGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" echo -e "\t[BUILD] ${choiceId} " packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build NVIDIAGraphicsEnabler package module } @@ -735,7 +733,7 @@ echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}" packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}") - buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1 + buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" addChoice --group="${builtOptionsList}" \ --start-selected="check_chameleon_option('$key','$value')" \ --pkg-refs="$packageRefId" "${optionName}" @@ -772,7 +770,7 @@ echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}" packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" # Add the Keylayout package because the Keylayout module is needed addChoice --group="KeyLayout" \ --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \ @@ -796,7 +794,7 @@ rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}" packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}") - buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1 + buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" addChoice --group="Themes" --start-selected="false" --pkg-refs="$packageRefId" "${theme}" done # End build theme packages# End build Extras package @@ -810,7 +808,7 @@ cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1 + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build post install package