Index: branches/blackosx/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1791) +++ branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1792) @@ -17,6 +17,79 @@ 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MEMTEST86_LICENSE; sourceTree = ""; }; 1D145307137073F40050C0CD /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; sourceTree = ""; }; 1D2A1AF513743A2600787720 /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; 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 = ""; }; @@ -649,9 +722,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 = ""; }; @@ -660,7 +744,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 = ""; }; @@ -933,11 +1016,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 = ""; }; @@ -968,6 +1051,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 = ""; }; @@ -1141,37 +1237,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 = ""; }; @@ -1207,24 +1272,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 = ( @@ -2328,8 +2446,6 @@ isa = PBXGroup; children = ( A354B6271495124F00D81AA5 /* ESPpostinstall */, - A354B6281495124F00D81AA5 /* postinstall */, - A354B6291495124F00D81AA5 /* preinstall */, A354B62A1495124F00D81AA5 /* Standardpostinstall */, ); path = Main; @@ -2345,7 +2461,6 @@ A354B630149514DE00D81AA5 /* CheckPreviousChameleon.sh */, A354B631149514DE00D81AA5 /* CheckProceed.sh */, A354B632149514DE00D81AA5 /* CheckWindowsDiskSignature.sh */, - A354B633149514DE00D81AA5 /* InstallLog.sh */, A354B634149514DE00D81AA5 /* MountESP.sh */, A354B635149514DE00D81AA5 /* patch */, A354B636149514DE00D81AA5 /* SetActivePartition.sh */, @@ -2947,6 +3062,8 @@ B0056D8311F3868000754B65 /* package */ = { isa = PBXGroup; children = ( + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */, + 36B43E8114BCE91300D29461 /* OptionalSettings */, A35D2187141A75DC00969AC0 /* slimpkg.sh */, A35D2188141A75DC00969AC0 /* buildpkg.sh */, A35D2189141A75DC00969AC0 /* builddmg.sh */, @@ -3019,37 +3136,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 = ""; @@ -3146,29 +3293,50 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "Chameleon" */; compatibilityVersion = "Xcode 3.2"; 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 = ""; @@ -3183,17 +3351,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 = ""; @@ -3205,7 +3385,7 @@ A37D7D56141B7C6F0069C38B /* en */, A37D7D5B141B7C6F0069C38B /* es */, A37D7D60141B7C6F0069C38B /* fr */, - A37D7D65141B7C6F0069C38B /* hr-HR */, + A37D7D65141B7C6F0069C38B /* hr */, A37D7D6A141B7C6F0069C38B /* id */, A37D7D6F141B7C6F0069C38B /* it */, A37D7D74141B7C6F0069C38B /* pl */, @@ -3223,7 +3403,7 @@ A37D7D57141B7C6F0069C38B /* en */, A37D7D5C141B7C6F0069C38B /* es */, A37D7D61141B7C6F0069C38B /* fr */, - A37D7D66141B7C6F0069C38B /* hr-HR */, + A37D7D66141B7C6F0069C38B /* hr */, A37D7D6B141B7C6F0069C38B /* id */, A37D7D70141B7C6F0069C38B /* it */, A37D7D75141B7C6F0069C38B /* pl */, @@ -3241,7 +3421,7 @@ A37D7D52141B7C6F0069C38B /* de */, A37D7D5D141B7C6F0069C38B /* es */, A37D7D62141B7C6F0069C38B /* fr */, - A37D7D67141B7C6F0069C38B /* hr-HR */, + A37D7D67141B7C6F0069C38B /* hr */, A37D7D6C141B7C6F0069C38B /* id */, A37D7D71141B7C6F0069C38B /* it */, A37D7D76141B7C6F0069C38B /* pl */, @@ -3255,17 +3435,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/blackosx/package/Scripts.templates/InstallerLog/InstallLog.sh =================================================================== --- branches/blackosx/package/Scripts.templates/InstallerLog/InstallLog.sh (revision 0) +++ branches/blackosx/package/Scripts.templates/InstallerLog/InstallLog.sh (revision 1792) @@ -0,0 +1,50 @@ +#!/bin/bash + +#echo "===============================================" +#echo "InstallLog: Create/Append installation log" +#echo "**********************************************" + +# Writes to the @LOG_FILENAME@ file created +# by the preinstall script at the start of installation. + +# Receives two parameters +# $1 = selected volume for location of the install log +# $2 = text to write to the installer log + +if [ "$#" -eq 2 ]; then + logLocation="$1" + verboseText="$2" + #echo "DEBUG: passed argument = ${logLocation}" + #echo "DEBUG: passed argument = ${verboseText}" +else + echo "InstallLog: Error - wrong number of values passed" + exit 9 +fi + +logName="@LOG_FILENAME@" +logFile="${logLocation}"/$logName + +if [ -f "${logFile}" ]; then + + # Append messages to the log as passed by other scripts. + if [ "${verboseText}" = "Diskutil" ]; then + diskutil list >>"${logFile}" + echo "======================================================" >>"${logFile}" + fi + + if [ "${verboseText}" = "LineBreak" ]; then + echo "======================================================" >>"${logFile}" + fi + + if [[ "${verboseText}" == *fdisk* ]]; then + targetDiskRaw="${verboseText#fdisk *}" + fdisk $targetDiskRaw >>"${logFile}" + echo " " >>"${logFile}" + fi + + if [ "${verboseText}" != "LineBreak" ] && [[ "${verboseText}" != *fdisk* ]] && [[ "${verboseText}" != "Diskutil" ]]; then + echo "${verboseText}" >> "${logFile}" + fi +fi + +exit 0 Property changes on: branches/blackosx/package/Scripts.templates/InstallerLog/InstallLog.sh ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Scripts.templates/Post/postinstall =================================================================== --- branches/blackosx/package/Scripts.templates/Post/postinstall (revision 0) +++ branches/blackosx/package/Scripts.templates/Post/postinstall (revision 1792) @@ -0,0 +1,293 @@ +#!/bin/bash + +mergeString () { + local src="${1}" + local new="${2}" + local result="$src" + + for newItem in $new ;do + local found=0 + for srcItem in $src ;do + if [[ $newItem == $srcItem ]];then + found=1 + break + fi + done + [[ $found -eq 0 ]] && result="$result $newItem" + done + + echo "$result" +} + +echo "===============================================" +echo "Post Post-Install Script" +echo "*********************************" + +#echo "DEBUG: $ 1 = Full path to the installation package the installer app is processing: " $1 +#echo "DEBUG: $ 2 = Full path to the installation destination: " $2 +#echo "DEBUG: $ 3 = Installation volume (mountpoint) to receive the payload: " $3 +#echo "DEBUG: $ 4 = Root directory for the system: " $4 + +# Check target exists +if [ ! -e "$3" ] +then + echo "$3 volume does not exist!" + exit 1 +fi + +# If target volume root of current system then replace +# / with volume name. +if [ "$3" == "/" ] +then + dest_vol="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) +else + dest_vol="$3" +fi + +# Find script location so to find the Install Log script. +MYLOCATION="${PWD}/${BASH_ARGV[0]}" +export MYLOCATION="${MYLOCATION%/*}" +scriptDir=$MYLOCATION + +# Write some information to the Install Log +"$scriptDir"InstallLog.sh "${dest_vol}" "Running Post postinstall script" +"$scriptDir"InstallLog.sh "${dest_vol}" "Target volume = ${dest_vol}" + +# set temporary directory +chamTemp="$dest_vol/usr/local/chamTemp" + + +# --------------------------------------------- +# Build org.chameleon.Boot.plist +# --------------------------------------------- +# All options selected are now dummy files with +# the filename of the option and value residing +# in /usr/local/chamTemp/options/ +# for example. Boot Banner=Yes + +# Are there any options to build? +if [ "$(ls -A ${chamTemp}/options )" ]; then + + # Check for temporary directory/Extra folder. + if [ ! -d "$chamTemp"/Extra ]; then + mkdir "$chamTemp"/Extra + fi + + # Create template for org.chameleon.Boot.plist" + tempOCBP="$chamTemp"/Extra/org.chameleon.Boot.plist + cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP" + + # Read list of all boot options the user added. + while IFS= read -r -d '' FILE; do + option="${FILE##*/}" + key="${option%%=*}" + value="${option#*=}" + + # Check for 'Kernel Flags' key indicate that should be a kernel flag + if [[ "$key" = "Kernel Flags" ]];then + # plistbuddy only add's if the key doesn't already exist. + # So let's store any kernelflags and add them all at the + # same time once when we reach the end of the options list. + kernelflag[${#kernelflag[*]}]="$value" + "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value" + else + # escape any spaces + keyToUse=$( echo "$key" | sed 's/ /\\ /g' ) + sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP" + returnValue=$? + if [ ${returnValue} -ne 1 ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}" + else + "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}" + fi + fi + done < <( find "${chamTemp}/options" -type f -print0 ) + + # Add any kernel flags together in to one string. + kernelFlagString="${kernelflag[@]}" + # We add the final string in the next section. +fi + +# --------------------------------------------- +# Add any installed modules to the Install Log +# --------------------------------------------- +if [ -e "${chamTemp}"/Extra/modules ]; then + ls "${chamTemp}"/Extra/modules | while read FILE + do + "$scriptDir"InstallLog.sh "${dest_vol}" "Added module: $FILE" + if [ "$FILE" == "Keylayout.dylib" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Also adding required Keymaps." + fi + done +fi + +# --------------------------------------------- +# Add any installed themes to the Install Log +# --------------------------------------------- +if [ -e "${chamTemp}"/Extra/Themes ]; then + ls "${chamTemp}"/Extra/Themes | while read FILE + do + "$scriptDir"InstallLog.sh "${dest_vol}" "Added Theme: $FILE" + done +fi + +# Does a temporary /Extra folder exist? +if [ -d "$chamTemp"/Extra ]; then + + # --------------------------------------------- + # Merge /Extra folders? + # --------------------------------------------- + # Does the user want to upgrade an existing /Extra folder? + # If so, then merge their existing one in to the temp one. + if [ -e "$chamTemp/install_type_upgrade" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to do an upgrade install." + + # first move the new org.chameleon.Boot.plist out of tmp + # Extra folder so we can merge that separately. + mv "$tempOCBP" "$chamTemp/holding.plist" + + # Check for an existing /Extra folder + # and merge existing /Extra with temp one. + if [ -e "$dest_vol"/.ChameleonEFI ]; then + if [ -e "/Volumes/EFI/Extra" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing /Volumes/EFI/Extra folder." + ditto --noextattr --noqtn /Volumes/EFI/Extra "$chamTemp"/Extra + fi + else + if [ -e "$dest_vol/Extra" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing ${dest_vol}/Extra folder." + ditto --noextattr --noqtn "${dest_vol}"/Extra "$chamTemp"/Extra + fi + fi + + # Check existing plist name for old naming convention + # and change to new convention. + if [ -e "$chamTemp"/Extra/com.apple.Boot.plist ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Renaming existing com.apple.Boot.plist to org.chameleon.Boot.plist." + mv "$chamTemp"/Extra/com.apple.Boot.plist "$tempOCBP" + fi + + # Before merging org.chameleon.Boot.plist, copy any + # existing kernel flags, then delete the entry. + currentFlags=$( sudo /usr/libexec/plistbuddy -c "Print :Kernel\ Flags" "$tempOCBP" ) + sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" + + # Merge new org.chameleon.Boot.plist (holding.plist) + # with their currently existing one. + "$scriptDir"InstallLog.sh "${dest_vol}" "------ +Merging new options into org.chameleon.Boot.plist. +NOTE: Please check the new merged org.chameleon.Boot.plist as +NOTE: any existing keys will NOT have been updated. +NOTE: For example: If you already had Wait=No as a boot option +NOTE: and chose Wait=Yes from the list, this will NOT be changed. +------" + sudo /usr/libexec/plistbuddy -c "Merge $chamTemp/holding.plist" "$tempOCBP" + + if [[ -n "$currentFlags" ]];then + # Combine new kernel flags with old ones. + kernelFlagString=$( mergeString "$currentFlags" "${kernelFlagString}" ) + fi + + elif [ -e "$chamTemp/install_type_new" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to make a new install." + fi + + # Write kernel flags option + kernelFlagString=$(echo ${kernelFlagString}) # Remove leading and trailing spaces + if [[ -n "$kernelFlagString" ]];then + sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" + returnValue=$? + if [ ${returnValue} -ne 0 ]; then # key already exists. + sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" + sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" + fi + fi + + # --------------------------------------------- + # Copy temp Extra folder to target destination + # --------------------------------------------- + # Check for an existing /Extra folder. If found, back it up + # before copying the temporary Extra folder to destination. + # Extra folder now resides in /usr/local/chamTemp/ + # Copy /usr/local/chamTemp/Extra to correct location. + + if [ ! -f "$dest_vol"/.ChameleonEFI ]; then + # The Standard install option chosen + rm -rf "$dest_vol/Extra" # Remove old Extra directory + + "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/" + echo "Copying $chamTemp/Extra TO $dest_vol" + cp -R "$chamTemp"/Extra "$dest_vol" + else + # The EFI system partition install option was chosen + rm -rf "/Volumes/EFI/Extra" # Remove old Extra directory + + "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/" + cp -R "$chamTemp"/Extra "/Volumes/EFI" + fi +else + if [ ! -f "$dest_vol"/.ChameleonEFI ]; then + if [ -e "$dest_vol"/Extra ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, +so leaving existing $dest_vol/Extra folder untouched." + fi + else + if [ -e "/Volumes/EFI/Extra" ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, +so leaving existing /Volumes/EFI/Extra folder untouched." + fi + fi +fi + +# --------------------------------------------- +# Update Rights +# --------------------------------------------- +chmod 777 ${dest_vol}/Extra 2>/dev/null +chmod 666 ${dest_vol}/Extra/*.plist 2>/dev/null + +# --------------------------------------------- +# Cleanup +# --------------------------------------------- + +# Unmount ALL mounted volumes named EFI +"$scriptDir"UnMountEFIvolumes.sh "${dest_vol}" "${scriptDir}" + +# remove any temporary boot sector files if they exist +if [ -d /tmp/newbs ]; then + cleanUp="${cleanUp},1a" + rm /tmp/newbs +fi +if [ -d /tmp/origbs ]; then + cleanUp="${cleanUp},1b" + rm /tmp/origbs +fi +if [ -d /tmp/newBootSector ]; then + cleanUp="${cleanUp},1c" + rm /tmp/newbs +fi +if [ -d /tmp/originalBootSector ]; then + cleanUp="${cleanUp},1d" + rm /tmp/origbs +fi + +# delete the temporary Chameleon folder +if [ -e "$chamTemp" ]; then + cleanUp="${cleanUp},2" + rm -rf "$chamTemp" +fi + +# Remove /.ChameleonEFI file +if [ -f "$dest_vol"/.ChameleonEFI ]; then + cleanUp="${cleanUp},3" + rm "$dest_vol"/.ChameleonEFI +fi + +"$scriptDir"InstallLog.sh "${dest_vol}" "Cleanup: ${cleanUp}" +"$scriptDir"InstallLog.sh "${dest_vol}" "LineBreak" +"$scriptDir"InstallLog.sh "${dest_vol}" "Post script complete" + +echo "===============================================" +echo "END - Post Post-Install Script" +echo "*********************************" +echo "-----------------------------------------------" +echo "" Property changes on: branches/blackosx/package/Scripts.templates/Post/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Scripts.templates/Pre/preinstall =================================================================== --- branches/blackosx/package/Scripts.templates/Pre/preinstall (revision 0) +++ branches/blackosx/package/Scripts.templates/Pre/preinstall (revision 1792) @@ -0,0 +1,86 @@ +#!/bin/bash + +echo "===============================================" +echo "Pre-Install Script" +echo "*********************************" +echo "-----------------------------------------------" +echo "" + +# Creates text file named '@LOG_FILENAME@' +# 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'). + +# 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. + +MYLOCATION="${PWD}/${BASH_ARGV[0]}" +export MYLOCATION="${MYLOCATION%/*}" +scriptDir=$MYLOCATION + + +# If target volume root of current system then replace +# / with volume name. +if [ "$3" == "/" ] +then + targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) +else + targetVolume="$3" +fi + +logName="@LOG_FILENAME@" +logFile="${targetVolume}/$logName" + +# --------------------------------------------- +# Preparing Backing up of Chameleon files +# --------------------------------------------- +backupRootDir="${targetVolume}/Chameleon.Backups" +backupDir="${backupRootDir}/"$( date -j "+%F-%Hh%M" ) + +# Create the backup dirextory +mkdir -p "$backupDir" + +[[ -f "$logFile" ]] && mv "$logFile" "${backupDir}/${logName}" # Backup old log file + +# Setup Chameleon Log file +# by writing header and diskutil list + +echo "Chameleon installer log - $( date ) +Installer version: %CHAMELEONVERSION% %CHAMELEONREVISION% +======================================================" >"${logFile}" + +diskutil list >>"${logFile}" +echo "======================================================" >>"${logFile}" + +# --------------------------------------------- +# Backing up Chameleon files +# --------------------------------------------- +echo "Backing up Chameleon files" >>"${logFile}" +# 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 "Backing up ${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 + +find "${backupRootDir}" -type d -depth -empty -exec rmdir {} \; # Remove empty directories + +echo "======================================================" >>"${logFile}" + +echo "===============================================" +echo "END - Pre-Install Script" +echo "*********************************" +echo "-----------------------------------------------" +echo "" + +exit 0 Property changes on: branches/blackosx/package/Scripts.templates/Pre/preinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Changes.txt =================================================================== --- branches/blackosx/package/Changes.txt (revision 1791) +++ branches/blackosx/package/Changes.txt (revision 1792) @@ -1,3 +1,7 @@ +- ErmaC - Update Language for whobuild resources. + +- JrCs - Improved Installer - Start using template scripts + - JrCs - Look for a com.apple.Boot.plist file for users upgrading from legacy installations - Only create Chameleon.Backups and write to the install log, if required. @@ -68,4 +72,4 @@ - slimpkg.sh changed to match the revised code in buildpkg.sh where applicable. -- English Localizable.strings revised to match latest additions and some texts updated. \ No newline at end of file +- English Localizable.strings revised to match latest additions and some texts updated. Index: branches/blackosx/package/Scripts/Main/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/postinstall (revision 1791) +++ branches/blackosx/package/Scripts/Main/postinstall (revision 1792) @@ -1,293 +0,0 @@ -#!/bin/bash - -mergeString () { - local src="${1}" - local new="${2}" - local result="$src" - - for newItem in $new ;do - local found=0 - for srcItem in $src ;do - if [[ $newItem == $srcItem ]];then - found=1 - break - fi - done - [[ $found -eq 0 ]] && result="$result $newItem" - done - - echo "$result" -} - -echo "===============================================" -echo "Post Post-Install Script" -echo "*********************************" - -#echo "DEBUG: $ 1 = Full path to the installation package the installer app is processing: " $1 -#echo "DEBUG: $ 2 = Full path to the installation destination: " $2 -#echo "DEBUG: $ 3 = Installation volume (mountpoint) to receive the payload: " $3 -#echo "DEBUG: $ 4 = Root directory for the system: " $4 - -# Check target exists -if [ ! -e "$3" ] -then - echo "$3 volume does not exist!" - exit 1 -fi - -# If target volume root of current system then replace -# / with volume name. -if [ "$3" == "/" ] -then - dest_vol="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) -else - dest_vol="$3" -fi - -# Find script location so to find the Install Log script. -MYLOCATION="${PWD}/${BASH_ARGV[0]}" -export MYLOCATION="${MYLOCATION%/*}" -scriptDir=$MYLOCATION - -# Write some information to the Install Log -"$scriptDir"InstallLog.sh "${dest_vol}" "Running Post postinstall script" -"$scriptDir"InstallLog.sh "${dest_vol}" "Target volume = ${dest_vol}" - -# set temporary directory -chamTemp="$dest_vol/usr/local/chamTemp" - - -# --------------------------------------------- -# Build org.chameleon.Boot.plist -# --------------------------------------------- -# All options selected are now dummy files with -# the filename of the option and value residing -# in /usr/local/chamTemp/options/ -# for example. Boot Banner=Yes - -# Are there any options to build? -if [ "$(ls -A ${chamTemp}/options )" ]; then - - # Check for temporary directory/Extra folder. - if [ ! -d "$chamTemp"/Extra ]; then - mkdir "$chamTemp"/Extra - fi - - # Create template for org.chameleon.Boot.plist" - tempOCBP="$chamTemp"/Extra/org.chameleon.Boot.plist - cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP" - - # Read list of all boot options the user added. - while IFS= read -r -d '' FILE; do - option="${FILE##*/}" - key="${option%%=*}" - value="${option#*=}" - - # Check for 'Kernel Flags' key indicate that should be a kernel flag - if [[ "$key" = "Kernel Flags" ]];then - # plistbuddy only add's if the key doesn't already exist. - # So let's store any kernelflags and add them all at the - # same time once when we reach the end of the options list. - kernelflag[${#kernelflag[*]}]="$value" - "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value" - else - # escape any spaces - keyToUse=$( echo "$key" | sed 's/ /\\ /g' ) - sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP" - returnValue=$? - if [ ${returnValue} -ne 1 ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}" - else - "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}" - fi - fi - done < <( find "${chamTemp}/options" -type f -print0 ) - - # Add any kernel flags together in to one string. - kernelFlagString="${kernelflag[@]}" - # We add the final string in the next section. -fi - -# --------------------------------------------- -# Add any installed modules to the Install Log -# --------------------------------------------- -if [ -e "${chamTemp}"/Extra/modules ]; then - ls "${chamTemp}"/Extra/modules | while read FILE - do - "$scriptDir"InstallLog.sh "${dest_vol}" "Added module: $FILE" - if [ "$FILE" == "Keylayout.dylib" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Also adding required Keymaps." - fi - done -fi - -# --------------------------------------------- -# Add any installed themes to the Install Log -# --------------------------------------------- -if [ -e "${chamTemp}"/Extra/Themes ]; then - ls "${chamTemp}"/Extra/Themes | while read FILE - do - "$scriptDir"InstallLog.sh "${dest_vol}" "Added Theme: $FILE" - done -fi - -# Does a temporary /Extra folder exist? -if [ -d "$chamTemp"/Extra ]; then - - # --------------------------------------------- - # Merge /Extra folders? - # --------------------------------------------- - # Does the user want to upgrade an existing /Extra folder? - # If so, then merge their existing one in to the temp one. - if [ -e "$chamTemp/install_type_upgrade" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to do an upgrade install." - - # first move the new org.chameleon.Boot.plist out of tmp - # Extra folder so we can merge that separately. - mv "$tempOCBP" "$chamTemp/holding.plist" - - # Check for an existing /Extra folder - # and merge existing /Extra with temp one. - if [ -e "$dest_vol"/.ChameleonEFI ]; then - if [ -e "/Volumes/EFI/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing /Volumes/EFI/Extra folder." - ditto --noextattr --noqtn /Volumes/EFI/Extra "$chamTemp"/Extra - fi - else - if [ -e "$dest_vol/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing ${dest_vol}/Extra folder." - ditto --noextattr --noqtn "${dest_vol}"/Extra "$chamTemp"/Extra - fi - fi - - # Check existing plist name for old naming convention - # and change to new convention. - if [ -e "$chamTemp"/Extra/com.apple.Boot.plist ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Renaming existing com.apple.Boot.plist to org.chameleon.Boot.plist." - mv "$chamTemp"/Extra/com.apple.Boot.plist "$tempOCBP" - fi - - # Before merging org.chameleon.Boot.plist, copy any - # existing kernel flags, then delete the entry. - currentFlags=$( sudo /usr/libexec/plistbuddy -c "Print :Kernel\ Flags" "$tempOCBP" ) - sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" - - # Merge new org.chameleon.Boot.plist (holding.plist) - # with their currently existing one. - "$scriptDir"InstallLog.sh "${dest_vol}" "------ -Merging new options into org.chameleon.Boot.plist. -NOTE: Please check the new merged org.chameleon.Boot.plist as -NOTE: any existing keys will NOT have been updated. -NOTE: For example: If you already had Wait=No as a boot option -NOTE: and chose Wait=Yes from the list, this will NOT be changed. -------" - sudo /usr/libexec/plistbuddy -c "Merge $chamTemp/holding.plist" "$tempOCBP" - - if [[ -n "$currentFlags" ]];then - # Combine new kernel flags with old ones. - kernelFlagString=$( mergeString "$currentFlags" "${kernelFlagString}" ) - fi - - elif [ -e "$chamTemp/install_type_new" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to make a new install." - fi - - # Write kernel flags option - kernelFlagString=$(echo ${kernelFlagString}) # Remove leading and trailing spaces - if [[ -n "$kernelFlagString" ]];then - sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" - returnValue=$? - if [ ${returnValue} -ne 0 ]; then # key already exists. - sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" - sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" - fi - fi - - # --------------------------------------------- - # Copy temp Extra folder to target destination - # --------------------------------------------- - # Check for an existing /Extra folder. If found, back it up - # before copying the temporary Extra folder to destination. - # Extra folder now resides in /usr/local/chamTemp/ - # Copy /usr/local/chamTemp/Extra to correct location. - - if [ ! -f "$dest_vol"/.ChameleonEFI ]; then - # The Standard install option chosen - rm -rf "$dest_vol/Extra" # Remove old Extra directory - - "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/" - echo "Copying $chamTemp/Extra TO $dest_vol" - cp -R "$chamTemp"/Extra "$dest_vol" - else - # The EFI system partition install option was chosen - rm -rf "/Volumes/EFI/Extra" # Remove old Extra directory - - "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/" - cp -R "$chamTemp"/Extra "/Volumes/EFI" - fi -else - if [ ! -f "$dest_vol"/.ChameleonEFI ]; then - if [ -e "$dest_vol"/Extra ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, -so leaving existing $dest_vol/Extra folder untouched." - fi - else - if [ -e "/Volumes/EFI/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, -so leaving existing /Volumes/EFI/Extra folder untouched." - fi - fi -fi - -# --------------------------------------------- -# Update Rights -# --------------------------------------------- -chmod 777 ${dest_vol}/Extra 2>/dev/null -chmod 666 ${dest_vol}/Extra/*.plist 2>/dev/null - -# --------------------------------------------- -# Cleanup -# --------------------------------------------- - -# Unmount ALL mounted volumes named EFI -"$scriptDir"UnMountEFIvolumes.sh "${dest_vol}" "${scriptDir}" - -# remove any temporary boot sector files if they exist -if [ -d /tmp/newbs ]; then - cleanUp="${cleanUp},1a" - rm /tmp/newbs -fi -if [ -d /tmp/origbs ]; then - cleanUp="${cleanUp},1b" - rm /tmp/origbs -fi -if [ -d /tmp/newBootSector ]; then - cleanUp="${cleanUp},1c" - rm /tmp/newbs -fi -if [ -d /tmp/originalBootSector ]; then - cleanUp="${cleanUp},1d" - rm /tmp/origbs -fi - -# delete the temporary Chameleon folder -if [ -e "$chamTemp" ]; then - cleanUp="${cleanUp},2" - rm -rf "$chamTemp" -fi - -# Remove /.ChameleonEFI file -if [ -f "$dest_vol"/.ChameleonEFI ]; then - cleanUp="${cleanUp},3" - rm "$dest_vol"/.ChameleonEFI -fi - -"$scriptDir"InstallLog.sh "${dest_vol}" "Cleanup: ${cleanUp}" -"$scriptDir"InstallLog.sh "${dest_vol}" "LineBreak" -"$scriptDir"InstallLog.sh "${dest_vol}" "Post script complete" - -echo "===============================================" -echo "END - Post Post-Install Script" -echo "*********************************" -echo "-----------------------------------------------" -echo "" Index: branches/blackosx/package/Scripts/Main/preinstall =================================================================== --- branches/blackosx/package/Scripts/Main/preinstall (revision 1791) +++ branches/blackosx/package/Scripts/Main/preinstall (revision 1792) @@ -1,93 +0,0 @@ -#!/bin/bash - -echo "===============================================" -echo "Pre-Install Script" -echo "*********************************" -echo "-----------------------------------------------" -echo "" - -# Creates text file named 'Chameleon_Installer_Log.txt' -# 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'. - -# 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. - -MYLOCATION="${PWD}/${BASH_ARGV[0]}" -export MYLOCATION="${MYLOCATION%/*}" -scriptDir=$MYLOCATION - - -# If target volume root of current system then replace -# / with volume name. -if [ "$3" == "/" ] -then - targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) -else - targetVolume="$3" -fi - -logName="Chameleon_Installer_Log.txt" -logFile="${targetVolume}/$logName" - -versionNumber=`cat "${scriptDir}"/Resources/version` -revisionNumber=`cat "${scriptDir}"/Resources/revision` - - -# --------------------------------------------- -# Preparing Backing up of Chameleon files -# --------------------------------------------- -backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" ) -if [[ -f "$logFile" ]];then - # Only make backupDir if required - mkdir -p "$backupDir" - # Backup old log file - mv "$logFile" "${backupDir}/${logName}" -fi - - -# Setup Chameleon_Installer_Log.txt file -# by writing header and diskutil list - -echo "Chameleon installer log - $( date ) -Installer version: ${versionNumber} ${revisionNumber} -======================================================" >"${logFile}" - -diskutil list >>"${logFile}" -echo "======================================================" >>"${logFile}" - -# --------------------------------------------- -# 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}" -fi - -echo "===============================================" -echo "END - Pre-Install Script" -echo "*********************************" -echo "-----------------------------------------------" -echo "" - -exit 0 Index: branches/blackosx/package/Scripts/Sub/InstallLog.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/InstallLog.sh (revision 1791) +++ branches/blackosx/package/Scripts/Sub/InstallLog.sh (revision 1792) @@ -1,53 +0,0 @@ -#!/bin/bash - -#echo "===============================================" -#echo "InstallLog: Create/Append installation log" -#echo "**********************************************" - -# Writes to the Chameleon_Installer_Log.txt file created -# by the preinstall script at the start of installation. - -# Receives two parameters -# $1 = selected volume for location of the install log -# $2 = text to write to the installer log - -if [ "$#" -eq 2 ]; then - logLocation="$1" - verboseText="$2" - #echo "DEBUG: passed argument = ${logLocation}" - #echo "DEBUG: passed argument = ${verboseText}" -else - echo "InstallLog: Error - wrong number of values passed" - exit 9 -fi - - - -logName="Chameleon_Installer_Log.txt" -logFile="${logLocation}"/$logName - - -if [ -f "${logFile}" ]; then - - # Append messages to the log as passed by other scripts. - if [ "${verboseText}" = "Diskutil" ]; then - diskutil list >>"${logFile}" - echo "======================================================" >>"${logFile}" - fi - - if [ "${verboseText}" = "LineBreak" ]; then - echo "======================================================" >>"${logFile}" - fi - - if [[ "${verboseText}" == *fdisk* ]]; then - targetDiskRaw="${verboseText#fdisk *}" - fdisk $targetDiskRaw >>"${logFile}" - echo " " >>"${logFile}" - fi - - if [ "${verboseText}" != "LineBreak" ] && [[ "${verboseText}" != *fdisk* ]] && [[ "${verboseText}" != "Diskutil" ]]; then - echo "${verboseText}" >> "${logFile}" - fi -fi - -exit 0 \ No newline at end of file Index: branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : ???\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/zh_TW.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,7 +1,8 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light; } -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red128\green128\blue128; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -58,6 +59,9 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 -\f1 \cf3 \'c2\'bd\'c4\'b6 -\f0 : crazybirdy, Ulimate} +\fs20 \cf0 Copyright \'a9 2011-2012 +\f1 \cf3 \'c2\'bd\'c4\'b6 +\f0 : crazybirdy, Ulimate\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -13,7 +13,7 @@ \f1 \'81\'4b\'d4\'da\'df\'78\'93\'f1\'b0\'b2\'d1\'62\'b5\'c4\'b7\'d6\'b8\'ee\'85\'5e\'bd\'a8\'c1\'a2 \f0 \cf2 \ -\cf3 Chameleon_Installer_Log.txt +\cf3 @LOG_FILENAME@ \f1 \cf0 \'bc\'6f\'e4\'9b\'ce\'c4\'bc\'fe\'a1\'a3 \f0 \cf2 \ \ @@ -36,4 +36,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : ???\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Jangan dinstall Apple Macintosh ASLI\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Rudolf Tingginehe & Babiloe\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : Rudolf Tingginehe & Babiloe\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Skrip ini telah selesai dan telah disematkan pada\ - berkas \cf2 Chameleon_Installer_Log.txt\cf3 yang ditaruh di\ + berkas \cf2 @LOG_FILENAME@\cf3 yang ditaruh di\ direktori utama dari partisi yang terinstall.\ \ \cf0 Silahkan \cf4 baca\cf0 berkas itu dan perhatikan apakah instalasi telah\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Hak kopi \'a9 2011} +\fs20 Hak kopi \'a9 2011-2012} Index: branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : ???\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/zh_CN.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,7 +1,8 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light; } -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red128\green128\blue128; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -58,6 +59,9 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 +\fs20 \cf0 Copyright \'a9 2011-2012 \f1 \cf3 \'c2\'bd\uc0\u35793 -\f0 : crazybirdy, Ulimate} +\f0 : crazybirdy, Ulimate\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -13,7 +13,7 @@ \f1 \'b2\'a2\'d4\'da\'d1\'a1\'d4\'f1\'b0\'b2\'d7\'b0\'b5\'c4\'b7\'d6\'c7\'f8\'bd\'a8\'c1\'a2 \f0 \cf2 \ -\cf3 Chameleon_Installer_Log.txt +\cf3 @LOG_FILENAME@ \f1 \cf0 \'bc\'cd\'c2\'bc\'ce\'c4\'bc\'fe\'a1\'a3 \f0 \cf2 \ \ @@ -36,4 +36,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset178 GeezaPro;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12500\viewkind0 \pard\ri0\qc @@ -65,4 +66,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Mohamed Khairy\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : Mohamed Khairy\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -14,7 +14,7 @@ \f0 \ \f1 \'de\'cf -\f0 \cf2 Chameleon_Installer_Log.txt\cf3 +\f0 \cf2 @LOG_FILENAME@\cf3 \f1 \'ed\'d3\'e3\'ec \f0 \ @@ -60,4 +60,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Blackosx\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : Blackosx\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1791) +++ branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1792) @@ -256,26 +256,26 @@ "mac-se_title" = "Teclado Mac Sueco"; "mac-se_description" = "Usa o layout para teclado Mac Sueco."; -"mac-pt_title" = "Portuguese Mac Keyboard"; -"mac-pt_description" = "Use the keyboard layout for a Portuguese Mac keyboard"; +"mac-pt_title" = "Teclado Mac Português"; +"mac-pt_description" = "Usa o layout para teclado Mac Português."; -"pc-de_title" = "German PC Keyboard"; -"pc-de_description" = "Use the keyboard layout for a German PC keyboard"; +"pc-de_title" = "Teclado PC Alemão"; +"pc-de_description" = "Usa o layout para teclado PC Alemão."; -"pc-es_title" = "Spanish PC Keyboard"; -"pc-es_description" = "Use the keyboard layout for a Spanish PC keyboard"; +"pc-es_title" = "Teclado PC Espanhol"; +"pc-es_description" = "Usa o layout para teclado PC Espanhol."; "pc-fr_title" = "Teclado PC Francês"; "pc-fr_description" = "Usa o layout para teclado PC Francês."; -"pc-it_title" = "Italian PC Keyboard"; -"pc-it_description" = "Use the keyboard layout for a Italian PC keyboard"; +"pc-it_title" = "Teclado PC Italiano"; +"pc-it_description" = "Usa o layout para teclado PC Italiano."; -"pc-se_title" = "Swedish PC Keyboard"; -"pc-se_description" = "Use the keyboard layout for a Swedish PC keyboard"; +"pc-se_title" = "Teclado PC Sueco"; +"pc-se_description" = "Usa o layout para teclado PC Sueco."; -"pc-pt_title" = "Portuguese PC Keyboard"; -"pc-pt_description" = "Use the keyboard layout for a Portuguese PC keyboard"; +"pc-pt_title" = "Teclado PC Português"; +"pc-pt_description" = "Usa o layout para teclado PC Português"; // ---------------------------------------------------------------------------- // Boot options - THEMES Index: branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : artur-pt\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : artur-pt\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Os scripts est\'e3o finalizados e foi gerado um\ - ficheiro \cf2 Chameleon_Installer_Log.txt\cf3 que se\ + ficheiro \cf2 @LOG_FILENAME@\cf3 que se\ encontra na raiz da parti\'e7\'e3o selecionada.\ \ \cf0 Por Favor \cf4 leia-o\cf0 para verificar se a instala\'e7\'e3o foi realizada\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh kompjutere\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0} +\fs20 \cf0 Copyright \'a9 2011 +\b \cf3 Translated by : mlstudio\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Skripte su zavr\'9aile i datoteka pod\ - nazivom \cf2 Chameleon_Installer_Log.txt\cf3 je snimljena\ + nazivom \cf2 @LOG_FILENAME@\cf3 je snimljena\ na root particije diska koje ste odabrali.\ \ \cf0 Molimo \cf4 pro\uc0\u269 itajte ga\cf0 kako biste saznali da li je instalacija bila\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 No lo instale en un ordenador Apple Macintosh\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traducido por : juanerson\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Traducido por : juanerson\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Los scripts se han completado y un archivo\ - de nombre \cf2 Chameleon_Installer_Log.txt\cf3 ha sido\ + de nombre \cf2 @LOG_FILENAME@\cf3 ha sido\ escrito en la ra\'edz de la partici\'f3n seleccionada.\ \ \cf0 Por favor \cf4 l\'e9alo\cf0 para saber si la instalaci\'f3n fue\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Ne pas installer sur un ordinateur Apple Macintosh\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traduit par : Tenval\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Traduit par : Tenval\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Les scripts sont termin\'e9s et un fichier\ - nomm\'e9 \cf2 Chameleon_Installer_Log.txt\cf3 a \cf0 \'e9\cf3 t\cf0 \'e9\cf3 \ + nomm\'e9 \cf2 @LOG_FILENAME@\cf3 a \cf0 \'e9\cf3 t\cf0 \'e9\cf3 \ \'e9\cf3 crit \'e0\'a0la racine de la partition choisie.\ \ \cf0 SVP \cf4 lisez le\cf0 pour savoir si l'installation est un\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 \uc0\u1053 \u1077 \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1080 \u1088 \u1072 \u1112 \u1090 \u1077 \u1085 \u1072 Apple Macintosh \u1082 \u1086 \u1084 \u1087 \u1112 \u1091 \u1090 \u1077 \u1088 \ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1086 \u1076 \u1089 \u1090 \u1088 \u1072 \u1085 \u1072 \u1085 \u1072 : kn6600\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1086 \u1076 \u1089 \u1090 \u1088 \u1072 \u1085 \u1072 \u1085 \u1072 : kn6600\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ \uc0\u1057 \u1082 \u1088 \u1080 \u1087 \u1090 \u1072 \u1090 \u1072 \u1077 \u1079 \u1072 \u1074 \u1088 \u1096 \u1077 \u1085 \u1072 \u1080 \u1076 \u1072 \u1090 \u1086 \u1090 \u1077 \u1082 \u1072 \ - \uc0\u1089 \u1086 \u1080 \u1084 \u1077 \cf2 Chameleon_Installer_Log.txt\cf3 \uc0\u1077 \ + \uc0\u1089 \u1086 \u1080 \u1084 \u1077 \cf2 @LOG_FILENAME@\cf3 \uc0\u1077 \ \uc0\u1079 \u1072 \u1087 \u1080 \u1096 \u1072 \u1085 \u1072 \u1074 \u1086 root \u1085 \u1072 \u1080 \u1079 \u1073 \u1088 \u1072 \u1085 \u1072 \u1090 \u1072 \u1087 \u1072 \u1088 \u1090 \u1080 \u1094 \u1080 \u1112 \u1072 .\ \ \cf0 \uc0\u1042 \u1077 \u1084 \u1086 \u1083 \u1080 \u1084 \u1077 \cf4 \uc0\u1087 \u1088 \u1086 \u1095 \u1080 \u1090 \u1072 \u1112 \u1090 \u1077 \u1112 \u1072 \cf0 \uc0\u1076 \u1072 \u1076 \u1086 \u1079 \u1085 \u1072 \u1077 \u1090 \u1077 \u1076 \u1072 \u1083 \u1080 \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1072 \u1094 \u1080 \u1112 \u1072 \u1090 \u1072 \ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 versie%CHAMELEONVERSION% revisie%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Installeer niet op een echte Apple Macintosh computer!\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Vertaald door: yeehaw123 & Badeendje\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Vertaald door: yeehaw123 & Badeendje\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ De installatie is klaar en het bestand\ - \cf2 Chameleon_Installer_Log.txt\cf3 is geschreven\ + \cf2 @LOG_FILENAME@\cf3 is geschreven\ naar de root van de door u gekozen partitie.\ \ \cf0 Alstublieft \cf4 lees het\cf0 document om te zien of de installatie\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unala\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : mlstudio\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Skripte su zavr\'9aene i mapa pod\ - nazivom \cf2 Chameleon_Installer_Log.txt\cf3 je snimljena\ + nazivom \cf2 @LOG_FILENAME@\cf3 je snimljena\ u korijen particije diska koje ste odabrali.\ \ \cf0 Molimo \cf4 pro\uc0\u269 itajte\cf0 kako biste saznali da li je instalacija\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/ko.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -55,7 +55,10 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 +\fs20 \cf0 Copyright \'a9 2011-2012 \f1 \cf3 \'b9\'f8\'bf\'aa \f2\b -\f0 by : drew_afx} +\f0 by : drew_afx +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -13,7 +13,7 @@ \'bc\'b1\'c5\'c3\'b5\'c8 \'c6\'c4\'c6\'bc\'bc\'c7\'c0\'c7 \'b7\'e7\'c6\'ae \'b5\'f0\'b7\'ba\'c5\'e4\'b8\'ae\'bf\'a1 \f2\b \ -\f0 \cf2 Chameleon_Installer_Log.txt +\f0 \cf2 @LOG_FILENAME@ \f1\b0 \cf3 \'b8\'a6 \'bb\'fd\'bc\'ba\'c7\'cf\'bf\'b4\'bd\'c0\'b4\'cf\'b4\'d9. \f0\b \ \ @@ -33,4 +33,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Nie instaluj na komputerze Apple Macintosh\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : janek202\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : janek202\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -7,7 +7,7 @@ \f0\b\fs28 \cf0 \ \ -Zako\uc0\u324 czono wykonywanie skrypt\'f3w i plik logu \cf2 Chameleon_Installer_Log.txt\cf3 zosta\uc0\u322 zapisany \ +Zako\uc0\u324 czono wykonywanie skrypt\'f3w i plik logu \cf2 @LOG_FILENAME@\cf3 zosta\uc0\u322 zapisany \ na g\uc0\u322 \'f3wnym katalogu wybranej partycji.\ \ \cf0 Prosz\uc0\u281 \cf4 przeczytaj go\cf0 by dowiedzie\uc0\u263 si\u281 ,\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -45,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Tradotto da : ErmaC e scrax\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Tradotto da : ErmaC e scrax\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 Questo pkg \'e8 stato compilato da: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Le operazioni sono state completate ed un file\ - chiamato \cf2 Chameleon_Installer_Log.txt\cf3 \'e9 stato\ + chiamato \cf2 @LOG_FILENAME@\cf3 \'e9 stato\ scritto nella root della partizione scelta.\ \ \cf0 Per favore \cf4 leggilo\cf0 per vedere se l'installazione \'e9\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings (revision 1791) +++ branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings (revision 1792) @@ -44,7 +44,7 @@ // Modules // ---------------------------------------------------------------------------- "Module_title" = "Módulos do Chameleon"; -"Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; +"Module_description" = "O sistema de módulos incorporados ao Chameleon permite que um utilizador ou desenvolvedor estenda a funcionalidade básica sem precisar substituir o arquivo boot principal."; "klibc_title" = "klibc"; "klibc_description" = "Este módulo fornece uma biblioteca C padrão para link, caso a do Chameleon seja insuficiente. @@ -256,26 +256,26 @@ "mac-se_title" = "Teclado Mac Sueco"; "mac-se_description" = "Usa o layout para teclado Mac Sueco."; -"mac-pt_title" = "Portuguese Mac Keyboard"; -"mac-pt_description" = "Use the keyboard layout for a Portuguese Mac keyboard"; +"mac-pt_title" = "Teclado Mac Português"; +"mac-pt_description" = "Usa o layout para teclado Mac Português."; -"pc-de_title" = "German PC Keyboard"; -"pc-de_description" = "Use the keyboard layout for a German PC keyboard"; +"pc-de_title" = "Teclado PC Alemão"; +"pc-de_description" = "Usa o layout para teclado PC Alemão."; -"pc-es_title" = "Spanish PC Keyboard"; -"pc-es_description" = "Use the keyboard layout for a Spanish PC keyboard"; +"pc-es_title" = "Teclado PC Espanhol"; +"pc-es_description" = "Usa o layout para teclado PC Espanhol."; "pc-fr_title" = "Teclado PC Francês"; "pc-fr_description" = "Usa o layout para teclado PC Francês."; -"pc-it_title" = "Italian PC Keyboard"; -"pc-it_description" = "Use the keyboard layout for a Italian PC keyboard"; +"pc-it_title" = "Teclado PC Italiano"; +"pc-it_description" = "Usa o layout para teclado PC Italiano."; -"pc-se_title" = "Swedish PC Keyboard"; -"pc-se_description" = "Use the keyboard layout for a Swedish PC keyboard"; +"pc-se_title" = "Teclado PC Sueco"; +"pc-se_description" = "Usa o layout para teclado PC Sueco."; -"pc-pt_title" = "Portuguese PC Keyboard"; -"pc-pt_description" = "Use the keyboard layout for a Portuguese PC keyboard"; +"pc-pt_title" = "Teclado PC Português"; +"pc-pt_description" = "Usa o layout para teclado PC Português"; // ---------------------------------------------------------------------------- // Boot options - THEMES @@ -317,7 +317,7 @@ // Resolution "Resolution_title" = "Resolução"; -"Resolution_description" = "Set one resolution to use."; +"Resolution_description" = "Configura a resolução do écran"; // Video "Video_title" = "Video"; Index: branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : oldnapalm\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : oldnapalm\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Os scripts est\'e3o finalizados e foi gerado um\ - ficheiro \cf2 Chameleon_Installer_Log.txt\cf3 que se\ + ficheiro \cf2 @LOG_FILENAME@\cf3 que se\ encontra na raiz da parti\'e7\'e3o selecionada.\ \ \cf0 Por Favor \cf4 leia-o\cf0 para verificar se a instala\'e7\'e3o foi realizada\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unare\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : mlstudio\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Skripte su zavr\'9aene i mapa pod\ - nazivom \cf2 Chameleon_Installer_Log.txt\cf3 je snimljena\ + nazivom \cf2 @LOG_FILENAME@\cf3 je snimljena\ u koren particije diska koje ste odabrali.\ \ \cf0 Molimo \cf4 pro\uc0\u269 itajte\cf0 kako biste saznali da li je instalacija bila\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 : ???\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 : ???\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Achtung ! Nicht auf einem Apple Macintosh Computer Installieren\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : !Xabbu, olegischinski & NextMac\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : !Xabbu, olegischinski & NextMac\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ Die Scripts wurden ausgef\'fchrt und eine Datei\ - genannt \cf2 Chameleon_Installer_Log.txt\cf3 wurde ins\ + genannt \cf2 @LOG_FILENAME@\cf3 wurde ins\ Rootverzeichnis deiner ausgesuchten Partition geschrieben. \ \ \cf0 Bitte \cf4 lese\cf5 die Datei\cf0 \cf3 um herauszufinden ob \ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf (revision 1792) @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; +} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc @@ -12,11 +13,7 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs50 \cf0 \ \pard\ri0\qc \fs28 \cf2 Do not install to an Apple Macintosh computer\ @@ -49,4 +46,8 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0} +\fs20 \cf0 Copyright \'a9 2011-2012 +\b \cf3 Translated by : ???\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr +\cf4 This package was builded by: %WHOBUILD%\ +} Index: branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf (revision 1791) +++ branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf (revision 1792) @@ -8,7 +8,7 @@ \f0\b\fs28 \cf0 \ \ The scripts have completed and a file\ - named \cf2 Chameleon_Installer_Log.txt\cf3 has been\ + named \cf2 @LOG_FILENAME@\cf3 has been\ written to the root of your chosen partition.\ \ \cf0 Please \cf4 read it\cf0 to find out if the installation was\ @@ -24,4 +24,4 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011} \ No newline at end of file +\fs20 Copyright \'a9 2011-2012} Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1791) +++ branches/blackosx/package/buildpkg.sh (revision 1792) @@ -9,6 +9,7 @@ declare -r SRCROOT="$1" declare -r SYMROOT="$2" declare -r PKG_BUILD_DIR="$3" +declare -r SCPT_TPL_DIR="${PKGROOT}/Scripts.templates" if [[ $# -lt 3 ]];then echo "Too few arguments. Aborting..." >&2 && exit 1 @@ -44,25 +45,28 @@ # ====== REVISION/VERSION ====== -declare -r version=$( cat version ) +declare -r CHAMELEON_VERSION=$( cat version ) # stage -stage=${version##*-} -stage=${stage/RC/Release Candidate } -stage=${stage/FINAL/2.1 Final} -declare -r stage +CHAMELEON_STAGE=${CHAMELEON_VERSION##*-} +CHAMELEON_STAGE=${CHAMELEON_STAGE/RC/Release Candidate } +CHAMELEON_STAGE=${CHAMELEON_STAGE/FINAL/2.1 Final} +declare -r CHAMELEON_STAGE -declare -r revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) -declare -r builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) -declare -r timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) +declare -r CHAMELEON_REVISION=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +declare -r CHAMELEON_BUILDDATE=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +declare -r CHAMELEON_TIMESTAMP=$( date -j -f "%Y-%m-%d %H:%M:%S" "${CHAMELEON_BUILDDATE}" "+%s" ) # ====== CREDITS ====== -declare -r develop=$(awk "NR==6{print;exit}" ${PKGROOT}/../CREDITS) -declare -r credits=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS) -declare -r pkgdev=$(awk "NR==14{print;exit}" ${PKGROOT}/../CREDITS) +declare -r CHAMELEON_DEVELOP=$(awk "NR==6{print;exit}" ${PKGROOT}/../CREDITS) +declare -r CHAMELEON_CREDITS=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS) +declare -r CHAMELEON_PKGDEV=$(awk "NR==14{print;exit}" ${PKGROOT}/../CREDITS) +declare -r CHAMELEON_WHOBUILD=$(whoami | awk '{print $1}' | cut -d ":" -f3) # ====== GLOBAL VARIABLES ====== +declare -r LOG_FILENAME="Chameleon_Installer_Log.txt" + declare -a pkgrefs declare -a choice_key declare -a choice_options @@ -93,6 +97,134 @@ echo "${result%"${result##*[![:space:]]}"}" # remove trailing whitespace characters } +argument () { + local opt="$1" + + if [[ $# -eq 0 ]];then + echo "$0: option requires an argument -- '$opt'" >&2; exit 1 + fi + echo "$opt" +} + +function makeSubstitutions () { + # Substition is like: Key=Value + # + # Optionnal arguments: + # --subst= : add a new substitution + # --subst : add a new substitution + # + # Last argument(s) is/are file(s) where substitutions must be made + + local ownSubst="" + + function addSubst () { + local mySubst="$1" + case "$mySubst" in + *=*) keySubst=${mySubst%%=*} + valSubst=${mySubst#*=} + ownSubst=$(printf "%s\n%s" "$ownSubst" "s&@$keySubst@&$valSubst&g;t t") + ;; + *) echo "Invalid substitution $mySubst" >&2 + exit 1 + ;; + esac + } + + # Check the arguments. + while [[ $# -gt 0 ]];do + local option="$1" + case "$option" in + --subst) shift; addSubst "$(argument $@)"; shift ;; + --subst=*) shift; addSubst "${option#*=}" ;; + -*) + echo "Unrecognized makeSubstitutions option '$option'" >&2 + exit 1 + ;; + *) break ;; + esac + done + + if [[ $# -lt 1 ]];then + echo "makeSubstitutions invalid number of arguments: at least one file needed" >&2 + exit 1 + fi + + local chameleonSubsts=" +s&%CHAMELEONVERSION%&${CHAMELEON_VERSION%%-*}&g +s&%CHAMELEONREVISION%&${CHAMELEON_REVISION}&g +s&%CHAMELEONSTAGE%&${CHAMELEON_STAGE}&g +s&%DEVELOP%&${CHAMELEON_DEVELOP}&g +s&%CREDITS%&${CHAMELEON_CREDITS}&g +s&%PKGDEV%&${CHAMELEON_PKGDEV}&g +s&%WHOBUILD%&${CHAMELEON_WHOBUILD}&g +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@LOG_FILENAME@&${LOG_FILENAME}&g;t t" + + local allSubst=" +$chameleonSubsts +$ownSubst" + + for file in "$@";do + cp -pf "$file" "${file}.in" + sed "$allSubst" "${file}.in" > "${file}" + rm -f "${file}.in" + done +} + +addTemplateScripts () { + # Arguments: + # --pkg-rootdir= : path of the pkg root dir + # + # Optionnal arguments: + # --subst= : add a new substitution + # --subst : add a new substitution + # + # Substition is like: Key=Value + # + # $n : Name of template(s) (templates are in package/Scripts.templates + + local pkgRootDir="" + declare -a allSubst + + # Check the arguments. + while [[ $# -gt 0 ]];do + local option="$1" + case "$option" in + --pkg-rootdir=*) shift; pkgRootDir="${option#*=}" ;; + --subst) shift; allSubst[${#allSubst[*]}]="$option"; allSubst[${#allSubst[*]}]="$1" ; shift ;; + --subst=*) shift; allSubst[${#allSubst[*]}]="${option}" ;; + -*) + echo "Unrecognized addTemplateScripts option '$option'" >&2 + exit 1 + ;; + *) break ;; + esac + done + if [[ $# -lt 1 ]];then + echo "addTemplateScripts invalid number of arguments: you must specify a template name" >&2 + exit 1 + fi + [[ -z "$pkgRootDir" ]] && { echo "Error addTemplateScripts: --pkg-rootdir option is needed" >&2 ; exit 1; } + [[ ! -d "$pkgRootDir" ]] && { echo "Error addTemplateScripts: directory '$pkgRootDir' doesn't exists" >&2 ; exit 1; } + + for templateName in "$@";do + local templateRootDir="${SCPT_TPL_DIR}/${templateName}" + [[ ! -d "$templateRootDir" ]] && { + echo "Error addTemplateScripts: template '$templateName' doesn't exists" >&2; exit 1; } + + # Copy files to destination + rsync -pr --exclude=.svn --exclude="*~" "$templateRootDir/" "$pkgRootDir/Scripts/" + done + + files=$( find "$pkgRootDir/Scripts/" -type f ) + if [[ ${#allSubst[*]} -gt 0 ]];then + makeSubstitutions "${allSubst[@]}" $files + else + makeSubstitutions $files + fi +} + getPackageRefId () { echo ${1//_/.}.${2//_/.} | tr [:upper:] [:lower:] } @@ -266,11 +398,7 @@ packagesidentity="${chameleon_package_identity}" choiceId="Pre" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts - ditto --noextattr --noqtn ${SRCROOT}/revision ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/revision - ditto --noextattr --noqtn ${SRCROOT}/version ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version - cp -f ${PKGROOT}/Scripts/Main/preinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts - cp -f ${PKGROOT}/Scripts/Sub/InstallLog.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" @@ -335,6 +463,7 @@ choiceId="Standard" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" InstallerLog cp -f ${PKGROOT}/Scripts/Main/${choiceId}postinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile @@ -348,6 +477,7 @@ choiceId="EFI" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" InstallerLog cp -f ${PKGROOT}/Scripts/Main/ESPpostinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile @@ -589,7 +719,7 @@ for (( i = 0 ; i < ${#themes[@]} ; i++ )); do theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' ) mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/" - rsync -r --exclude=.svn "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}" + 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" @@ -602,12 +732,8 @@ packagesidentity="${chameleon_package_identity}" choiceId="Post" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts - cp -f ${PKGROOT}/Scripts/Main/postinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts - cp -f ${PKGROOT}/Scripts/Sub/InstallLog.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} InstallerLog cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts - ditto --noextattr --noqtn ${SRCROOT}/revision ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/revision - ditto --noextattr --noqtn ${SRCROOT}/version ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" @@ -646,7 +772,7 @@ #[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" " header+="identifier=\"${packageRefId}\" " - header+="version=\"${version}\" " + header+="version=\"${CHAMELEON_VERSION}\" " [ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" " @@ -679,7 +805,7 @@ (cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .) # Add the package to the list of build packages - pkgrefs[${#pkgrefs[*]}]="\t#${packageName}.pkg" + pkgrefs[${#pkgrefs[*]}]="\t#${packageName}.pkg" rm -rf "${packagePath}" fi @@ -752,7 +878,7 @@ makedistribution () { declare -r distributionDestDir="${SYMROOT}" - declare -r distributionFilename="${packagename// /}-${version}-r${revision}.pkg" + declare -r distributionFilename="${packagename// /}-${CHAMELEON_VERSION}-r${CHAMELEON_REVISION}.pkg" declare -r distributionFilePath="${distributionDestDir}/${distributionFilename}" rm -f "${distributionDestDir}/${packagename// /}"*.pkg @@ -792,18 +918,9 @@ # CleanUp the directory find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \; -# Add Chameleon Version and Revision - perl -i -p -e "s/%CHAMELEONVERSION%/${version%%-*}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) - perl -i -p -e "s/%CHAMELEONREVISION%/${revision}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) + # Make substitutions like version, revision, stage, developers, credits, etc.. + makeSubstitutions $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) -# Add Chameleon Stage - perl -i -p -e "s/%CHAMELEONSTAGE%/${stage}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) - -# Adding Developer and credits - perl -i -p -e "s/%DEVELOP%/${develop}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) - perl -i -p -e "s/%CREDITS%/${credits}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) - perl -i -p -e "s/%PKGDEV%/${pkgdev}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) - # Create the final package pkgutil --flatten "${PKG_BUILD_DIR}/${packagename}" "${distributionFilePath}" @@ -828,9 +945,10 @@ echo -e $COL_GREEN" ===========" echo -e $COL_BLUE" Package name: "$COL_RESET"${distributionFilename}" echo -e $COL_BLUE" MD5: "$COL_RESET"$md5" - echo -e $COL_BLUE" Version: "$COL_RESET"$version" - echo -e $COL_BLUE" Stage: "$COL_RESET"$stage" - echo -e $COL_BLUE" Date/Time: "$COL_RESET"$builddate" + echo -e $COL_BLUE" Version: "$COL_RESET"$CHAMELEON_VERSION" + echo -e $COL_BLUE" Stage: "$COL_RESET"$CHAMELEON_STAGE" + echo -e $COL_BLUE" Date/Time: "$COL_RESET"$CHAMELEON_BUILDDATE" + echo -e $COL_BLUE" Builded by: "$COL_RESET"$CHAMELEON_WHOBUILD" echo "" } Property changes on: branches/blackosx ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r1774-1791