Index: branches/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.3b.pkg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.3b.pkg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.Embed.pkg2.1Main_Package_Elements/themes/Embed/.Chameleon/Extra/Themes/versioninstallTopostInstallrelocatablerequireAuthorizationparentidentifierinstallTo.pathextraFilesinstallFrom.isRelativeType03embed-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.Embed.pkg1.0Main_Package_Elements/themes/Embed/.Chameleon/Extra/Themes/installTo.pathinstallTopostInstallrelocatablerequireAuthorizationparentversionextraFilesidentifierinstallFrom.isRelativeType03embed-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/11postflight.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/11postflight.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/11postflight.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.postflight.pkg2.1.2bMain_Package_Elements/Scripts/postflight.sh/.Chameleon/installTo.isRelativeTypeinstallToscripts.scriptsDirectoryPath.pathrelocatableinstallTo.isAbsoluteTypescripts.postinstall.pathparentversioninstallTo.pathinstallFrom.isRelativeTypeMain_Package_Elements/Scripts/postflight.shMain_Package_Elements/Scripts11postflight-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.postflight.pkg2.1.3bMain_Package_Elements/Scripts/postflight.sh/.Chameleon/installTo.isRelativeTypeinstallToscripts.scriptsDirectoryPath.pathrelocatableinstallTo.isAbsoluteTypescripts.postinstall.pathparentversioninstallTo.pathinstallFrom.isRelativeTypeMain_Package_Elements/Scripts/postflight.shMain_Package_Elements/Scripts11postflight-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/02default.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/02default.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/02default.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.Default.pkg2.1Main_Package_Elements/themes/Default/.Chameleon/Extra/Themes/installToinstallFrom.isRelativeTypeinstallTo.isRelativeTypeinstallTo.isAbsoluteTypeversionparentidentifierrelocatablerequireAuthorizationextraFilesinstallTo.pathpostInstall02default-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.Default.pkg1.0Main_Package_Elements/themes/Default/.Chameleon/Extra/Themes/installToinstallFrom.isRelativeTypeinstallTo.isRelativeTypeinstallTo.isAbsoluteTypeversionparentidentifierrelocatablerequireAuthorizationextraFilesinstallTo.pathpostInstall02default-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.fdisk440.pkg2.1.2bMain_Package_Elements/i386/fdisk440/.Chameleon/i386/installTo.isRelativeTypeinstallTorelocatableinstallTo.isAbsoluteTypeparentversioninstallTo.pathinstallFrom.isRelativeType10fdisk-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.fdisk440.pkg1.0Main_Package_Elements/i386/fdisk440/.Chameleon/i386/installTo.isRelativeTypeinstallTorelocatableinstallTo.isAbsoluteTypeparentversioninstallTo.pathinstallFrom.isRelativeType10fdisk-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/12nullesp.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/12nullesp.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/12nullesp.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.nullESP.pkg2.1.2Main_Package_Elements/EFI System Partition/nullESP/.Chameleon/installToscripts.scriptsDirectoryPath.pathrelocatablescripts.postinstall.pathscripts.scriptsDirectoryPath.isRelativeTypeparentversioninstallTo.pathinstallFrom.isRelativeTypescripts.postinstall.isRelativeTypeMain_Package_Elements/Scripts/MainESPPostinstall.shMain_Package_Elements/Scripts12nullesp-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.nullESP.pkg2.1.3bMain_Package_Elements/EFI System Partition/nullESP/.Chameleon/installToscripts.scriptsDirectoryPath.pathrelocatablescripts.postinstall.pathscripts.scriptsDirectoryPath.isRelativeTypeparentversioninstallTo.pathinstallFrom.isRelativeTypescripts.postinstall.isRelativeTypeMain_Package_Elements/Scripts/MainESPPostinstall.shMain_Package_Elements/Scripts12nullesp-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/31nullhideboot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/31nullhideboot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/31nullhideboot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.nullhideboot.pkg2.1.2Main_Package_Elements/HideBoot/nullhideboot/.Chameleon/installTo.pathinstallFrom.isRelativeTypeinstallTorelocatableparentversion31nullhideboot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.nullhideboot.pkg1.0Main_Package_Elements/HideBoot/nullhideboot/.Chameleon/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion31nullhideboot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/32setfile.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/32setfile.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/32setfile.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.SetFile.pkg2.1.2bMain_Package_Elements/Tools/SetFile/.Chameleon/Tools/installTo.pathinstallFrom.isRelativeTypeinstallTorelocatableversionparent32setfile-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.SetFile.pkg1.0Main_Package_Elements/Tools/SetFile/.Chameleon/Tools/installTo.pathinstallFrom.isRelativeTypeinstallToparentversionrelocatable32setfile-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/index.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/index.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/index.xml (revision 252) @@ -1 +1 @@ -Chameleon/Users/blackosx/Documents/Chameleon_SVN/PackageBuilder_Blackosx/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.2b.pkgvoodooprojects.orgMain_Package_Elements/Resources/background.tiffMain_Package_Elements/Resources/English.lproj/License.rtfMain_Package_Elements/Resources/English.lproj/ReadMe.rtfdMain_Package_Elements/Resources/English.lproj/Welcome.rtfdMain_Package_Elements/Resources/English.lproj/Conclusion.rtfd01fakesmc.xml02default.xml03embed.xml04bdmesg.xml05boot.xml06boot.xml07boot.xml08boot.xml09boot.xml10fdisk.xml11postflight.xml12nullesp.xml13@arch+i386.xml14@dropssdt+yes.xml15@ethernetbuiltin+yes.xml16@generatecstates+yes.xml17@generatepstates+yes.xml18@graphicsenabler+yes.xml19@instantmenu+yes.xml20@restartfix+no.xml21@graphics_mode+1920x1200x32.xml22@graphics_mode+1920x1080x32.xml23@graphics_mode+1680x1050x32.xml24@graphics_mode+1600x900x32.xml25@graphics_mode+1280x1024x32.xml26@graphics_mode+1280x960x32.xml27@graphics_mode+1024x768x32.xml28@theme+default.xml29@theme+embed.xml30nullstandard.xml31nullhideboot.xml32setfile.xmlextraFilesproperties.titleproperties.customizeOptionpostinstallActions.actions \ No newline at end of file +Chameleon/Users/blackosx/Documents/Chameleon_SVN/PackageBuilder_Blackosx/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.3b.pkgvoodooprojects.orgMain_Package_Elements/Resources/background.tiffMain_Package_Elements/Resources/English.lproj/License.rtfMain_Package_Elements/Resources/English.lproj/ReadMe.rtfdMain_Package_Elements/Resources/English.lproj/Welcome.rtfdMain_Package_Elements/Resources/English.lproj/Conclusion.rtfd01fakesmc.xml02default.xml03embed.xml04bdmesg.xml05boot.xml06boot.xml07boot.xml08boot.xml09boot.xml10fdisk.xml11postflight.xml12nullesp.xml13@arch+i386.xml14@dropssdt+yes.xml15@ethernetbuiltin+yes.xml16@generatecstates+yes.xml17@generatepstates+yes.xml18@graphicsenabler+yes.xml19@instantmenu+yes.xml20@restartfix+no.xml21@graphics_mode+1920x1200x32.xml22@graphics_mode+1920x1080x32.xml23@graphics_mode+1680x1050x32.xml24@graphics_mode+1600x900x32.xml25@graphics_mode+1280x1024x32.xml26@graphics_mode+1280x960x32.xml27@graphics_mode+1024x768x32.xml28@theme+default.xml29@theme+embed.xml30nullstandard.xml31nullhideboot.xml32setfile.xmlpostinstallActions.actionsproperties.titleproperties.customizeOptionextraFiles \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.boot.pkg2.1.2bMain_Package_Elements/i386/boot/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionparentinstallTorelocatable05boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.boot.pkg1.0Main_Package_Elements/i386/boot/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionrelocatableinstallToparent05boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/06boot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/06boot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/06boot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.boot0.pkg2.1.2bMain_Package_Elements/i386/boot0/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionparentinstallTorelocatable06boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.boot0.pkg1.0Main_Package_Elements/i386/boot0/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionrelocatableinstallToparent06boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/01fakesmc.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/01fakesmc.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/01fakesmc.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.FakeSMC.pkg2.1Main_Package_Elements/Kexts/FakeSMC.kext/.Chameleon/Extra/Extensions/parentinstallTopostInstallrelocatableidentifierrequireAuthorizationversioninstallTo.pathextraFilesinstallFrom.isRelativeType01fakesmc-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.FakeSMC.pkg1.0Main_Package_Elements/Kexts/FakeSMC.kext/.Chameleon/Extra/Extensions/installTo.pathinstallTopostInstallrelocatablerequireAuthorizationidentifierparentextraFilesversioninstallFrom.isRelativeType01fakesmc-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/07boot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/07boot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/07boot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.boot0hfs.pkg2.1.2bMain_Package_Elements/i386/boot0hfs/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionparentinstallTorelocatable07boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.boot0hfs.pkg1.0Main_Package_Elements/i386/boot0hfs/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionrelocatableinstallToparent07boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/08boot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/08boot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/08boot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.boot1f32.pkg2.1.2bMain_Package_Elements/i386/boot1f32/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionparentinstallTorelocatable08boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.boot1f32.pkg1.0Main_Package_Elements/i386/boot1f32/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionrelocatableinstallToparent08boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/09boot.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/09boot.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/09boot.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.boot1h.pkg2.1.2bMain_Package_Elements/i386/boot1h/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionparentinstallTorelocatable09boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.boot1h.pkg1.0Main_Package_Elements/i386/boot1h/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeversionrelocatableinstallToparent09boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/30nullstandard.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/30nullstandard.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/30nullstandard.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.nullstandard.pkg2.1.2Main_Package_Elements/Standard/nullstandard/.Chameleon/installTorelocatablescripts.scriptsDirectoryPath.isRelativeTypeparentversioninstallTo.pathinstallFrom.isRelativeTypescripts.postinstall.isRelativeTypeMain_Package_Elements/Scripts/MainStandardPostinstall.shMain_Package_Elements/Scripts30nullstandard-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.nullstandard.pkg2.1.3bMain_Package_Elements/Standard/nullstandard/.Chameleon/installTorelocatablescripts.scriptsDirectoryPath.isRelativeTypeparentversioninstallTo.pathinstallFrom.isRelativeTypescripts.postinstall.isRelativeTypeMain_Package_Elements/Scripts/MainStandardPostinstall.shMain_Package_Elements/Scripts30nullstandard-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg.xml =================================================================== --- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg.xml (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg.xml (revision 252) @@ -1 +1 @@ -voodooprojects.org.chameleon.bdmesg.pkg2.1.2bMain_Package_Elements/i386/bdmesg/.Chameleon/i386/installTolocationTyperelocatableparentversioninstallTo.pathinstallFrom.isRelativeType04bdmesg-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +voodooprojects.org.chameleon.bdmesg.pkg1.0Main_Package_Elements/i386/bdmesg/.Chameleon/i386/installTolocationTyperelocatableparentversioninstallTo.pathinstallFrom.isRelativeType04bdmesg-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/CheckDiskSignature.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/CheckDiskSignature.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/CheckDiskSignature.sh (revision 252) @@ -20,7 +20,7 @@ echo "${disksignature}" -if [ $disksignature = "00000000" ]; then +if [ "${disksignature}" = "00000000" ]; then echo "No Windows installation detected." echo "-----------------------------------------------" echo "" Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage1.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage1.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage1.sh (revision 252) @@ -31,26 +31,18 @@ if [ ${espformat} = "2" ]; then # the selected partition FAT formatted - # check to see if install to EFI system partition was selected - # if chosen, the package installer will add a file named 'nullESP' - # in to the temporary directory /.Chameleon + echo "Executing command: dd if=${targetDeviceRaw} count=1 bs=512 of=/tmp/origbs" + dd if=${targetDeviceRaw} count=1 bs=512 of=/tmp/origbs - #if [ -f ${selectedDestination}/.Chameleon/nullESP ]; then - echo "Executing command: dd if=${targetDeviceRaw} count=1 bs=512 of=/tmp/origbs" - dd if=${targetDeviceRaw} count=1 bs=512 of=/tmp/origbs + echo "Executing command: cp cp ${selectedDestination}/.Chameleon/i386/${stage1LoaderFAT} /tmp/newbs" + cp "${selectedDestination}"/.Chameleon/i386/${stage1LoaderFAT} /tmp/newbs - echo "Executing command: cp /.Chameleon/i386/${stage1LoaderFAT} /tmp/newbs" - cp ${selectedDestination}/.Chameleon/i386/${stage1LoaderFAT} /tmp/newbs + echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc" + dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc - echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc" - dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc + echo "Executing command: dd of=${targetDeviceRaw} count=1 bs=512 if=/tmp/newbs" + dd if=/tmp/newbs of="${targetDeviceRaw}" count=1 bs=512 - echo "Executing command: dd of=${targetDeviceRaw} count=1 bs=512 if=/tmp/newbs" - dd if=/tmp/newbs of="${targetDeviceRaw}" count=1 bs=512 - #else - # echo "Executing command: dd if=/.Chameleon/i386/${stage1LoaderFAT} of=${targetDeviceRaw}" - # dd if="${targetVolume}/.Chameleon/i386/${stage1LoaderFAT}" of=${targetDeviceRaw} - #fi fi echo "-----------------------------------------------" Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh (revision 252) @@ -30,7 +30,6 @@ echo "DEBUG: nullESP exists" - #[ -d "${targetVolume}" ] || mkdir -p "${targetVolume}" if [ ! -d "${targetVolume}" ]; then echo "Executing Command: mkdir -p ${targetVolume}" mkdir -p "${targetVolume}" Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 252) @@ -22,7 +22,7 @@ # If yes then check first for an existing /Extra folder on the # destination and if exists then back it up and delete existing. # Then transfer temporary Extra folder to destination. - + if [ -d "${3}"/.Chameleon/Extra ]; then # Check to see if install to EFI system partition was selected @@ -35,7 +35,7 @@ # have been cancelled, meaning the Extra folder needs to # be copied the selected destination. - if [ -f ${3}/.Chameleon/nullESP ] && ! [ -f ${3}/.Chameleon/nullstandard ]; then + if [ -f "${3}"/.Chameleon/nullESP ] && ! [ -f "${3}"/.Chameleon/nullstandard ]; then # Does an /Extra folder already exist at the target location? # If yes, then make a backup of it @@ -44,31 +44,34 @@ echo "DEBUG: Executing command: Backing up existing /Volumes/EFI/Extra" mkdir -p "/Volumes/EFI/ExtraBackup" cp -f -R "/Volumes/EFI/Extra" "/Volumes/EFI/ExtraBackup" + echo "Executing command: rm -f -R /Volumes/EFI/Extra" rm -f -R "/Volumes/EFI/Extra" fi echo "Executing command: ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra" - ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra + ditto "${3}"/.Chameleon/Extra /Volumes/EFI/Extra echo "Executing command: umount -f Volumes/EFI" "$scriptDir"UnMountEFIvolumes.sh returnValue=$? if [ ${returnValue} = 0 ]; then + echo "Executing command: rm -f -R /Volumes/EFI/" rm -R -f /Volumes/EFI fi else # Does an /Extra folder already exist at the target location? # If yes, then make a backup of it - if [ -d "${3}/Extra" ]; then - echo "DEBUG: Executing command: Backing up existing ${3}/Extra" - mkdir -p "${3}/ExtraBackup" - cp -f -R "${3}/Extra" "${3}/ExtraBackup" - rm -f -R "${3}/Extra" + if [ -d "${3}"/Extra ]; then + echo "DEBUG: Backing up existing ${3}/Extra" + mkdir -p "${3}"/ExtraBackup + cp -f -R "${3}"/Extra "${3}"/ExtraBackup + echo "Executing command: rm -f -R ${3}/Extra" + rm -f -R "${3}"/Extra fi echo "Executing command: ditto ${3}/.Chameleon/Extra ${3}/Extra" - ditto ${3}/.Chameleon/Extra ${3}/Extra + ditto "${3}"/.Chameleon/Extra "${3}"/Extra fi fi @@ -78,10 +81,14 @@ echo "Clean Up" echo "********" -# remove the temporary /.Chameleon directory -echo "Executing command: rm -r ${3}/.Chameleon/" -rm -r "${3}"/.Chameleon/ +# check the /.Chameleon temporary directory exists +# if yes, remove the temporary /.Chameleon directory +if [ -d "${3}"/.Chameleon ]; then + echo "Executing command: rm -r ${3}/.Chameleon/" + rm -r "${3}"/.Chameleon +fi + # remove the temporary boot sector files if they exist if [ -d /tmp/newbs ]; then echo "Executing command: rm /tmp/newbs" Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh (revision 252) @@ -9,7 +9,7 @@ if [ ! -d "${tempDir}" ]; then echo "the temporary directory does not exist so no boot options have been selected" else - # check for see if there are any boot options in the temporary directory + # check to see if there are any boot options in the temporary directory cd "${tempDir}" Dirlist=$(ls | grep "@") @@ -20,7 +20,7 @@ echo "set com.apple.Boot.plist variables" echo "**********************************" - bootplist="${tempDir}/Extra/com.apple.Boot.plist" + bootplist="${tempDir}Extra/com.apple.Boot.plist" echo "DEBUG: bootplist = ${bootplist}" systemplist="/Library/Preferences/SystemConfiguration/com.apple.Boot.plist" @@ -71,10 +71,12 @@ echo "Clean up and Remove Boot Option Null Files" echo "******************************************" - #cd "${3}/.Chameleon/" + # make sure we're in the right directory + cd "${tempDir}" + Dirlist=$(find . -type f | grep "@") - for bootOptionFile in $Dirlist ; do - echo $bootOptionFile + for bootOptionFile in ${Dirlist} ; do + echo "Removing temporary boot option file: ${bootOptionFile}" rm $bootOptionFile done @@ -196,6 +198,7 @@ IFS=${prefunctionifs} +echo " rm -f ${fileinput}" rm -f "${fileinput}" } Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainStandardPostinstall.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainStandardPostinstall.sh (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainStandardPostinstall.sh (revision 252) @@ -37,34 +37,33 @@ stage1LoaderFAT="boot1f32" stage2Loader="boot" -targetVolume=$3 #was bootvolume +targetVolume=$3 targetDevice=$( df "${targetVolume}" | sed -n '2p' | awk '{print $1}' ) targetDeviceRaw=${targetDevice/disk/rdisk} targetDisk=${targetDevice%s*} targetDiskRaw=${targetDisk/disk/rdisk} targetSlice=${targetDevice#*disk*s} -#resources="${0%/*}" -#echo "===============================================" -#echo "DEBUG: display script variables" -#echo "*******************************" +echo "===============================================" +echo "DEBUG: display script variables" +echo "*******************************" -#echo "DEBUG: stage0Loader: Disk loader is ${stage0Loader}" -#echo "DEBUG: stage0LoaderDualBoot: Disk loader is ${stage0LoaderDualBoot}" -#echo "DEBUG: stage1LoaderHFS: Partition loader is ${stage1LoaderHFS}" -#echo "DEBUG: stage1LoaderFat: Partition loader is ${stage1LoaderFAT}" -#echo "DEBUG: stage2Loader: Filesystem loader is ${stage2Loader}" -#echo "DEBUG: targetVolume: Volume is ${targetVolume}" -#echo "DEBUG: targetDevice: Volume device is ${targetDevice}" -#echo "DEBUG: targetDeviceRaw: Volume raw device is ${targetDeviceRaw}" -#echo "DEBUG: targetDisk: Disk device is ${targetDisk}" -#echo "DEBUG: targetDiskRaw: Disk raw device is ${targetDiskRaw}" -#echo "DEBUG: targetSlice: Volume slice is ${targetSlice}" -#echo "DEBUG: targetResources: Boot Resources is ${targetResources}" -#echo "-----------------------------------------------" -#echo "" +echo "DEBUG: stage0Loader: Disk loader is ${stage0Loader}" +echo "DEBUG: stage0LoaderDualBoot: Disk loader is ${stage0LoaderDualBoot}" +echo "DEBUG: stage1LoaderHFS: Partition loader is ${stage1LoaderHFS}" +echo "DEBUG: stage1LoaderFat: Partition loader is ${stage1LoaderFAT}" +echo "DEBUG: stage2Loader: Filesystem loader is ${stage2Loader}" +echo "DEBUG: targetVolume: Volume is ${targetVolume}" +echo "DEBUG: targetDevice: Volume device is ${targetDevice}" +echo "DEBUG: targetDeviceRaw: Volume raw device is ${targetDeviceRaw}" +echo "DEBUG: targetDisk: Disk device is ${targetDisk}" +echo "DEBUG: targetDiskRaw: Disk raw device is ${targetDiskRaw}" +echo "DEBUG: targetSlice: Volume slice is ${targetSlice}" +echo "DEBUG: targetResources: Boot Resources is ${targetResources}" +echo "-----------------------------------------------" +echo "" # Double check we can see the selected partition and it's of the right type Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf (revision 251) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf (revision 252) @@ -5,10 +5,10 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural \f0\b\fs36 \cf2 Unofficial Chameleon Test installer -\fs22 \cf0 v2.1.2b\ +\fs22 \cf0 v2.1.3b\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural -\b0 \cf3 by blackosx - 30th November 2010 +\b0 \cf3 by blackosx - 1st December 2010 \fs26 \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \