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
Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk-contents.xml
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk-contents.xml (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/10fdisk-contents.xml (revision 256)
@@ -1 +1 @@
-groupmodeowner
\ No newline at end of file
+modegroupowner
\ No newline at end of file
Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot-contents.xml
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot-contents.xml (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot-contents.xml (revision 256)
@@ -1 +1 @@
-groupmodeowner
\ No newline at end of file
+modegroupowner
\ No newline at end of file
Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/03embed.xml (revision 256)
@@ -1 +1 @@
-voodooprojects.org.chameleon.Embed.pkg1.0Main_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/extraFilesinstallTopostInstallrelocatablerequireAuthorizationparentversionidentifierinstallFrom.isRelativeTypeinstallTo.path03embed-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/31nullhideboot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.nullhideboot.pkg1.0Main_Package_Elements/HideBoot/nullhideboot/.Chameleon/installTo.pathinstallFrom.isRelativeTyperelocatableparentversioninstallTo31nullhideboot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$
\ No newline at end of file
Index: branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg-contents.xml
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg-contents.xml (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/04bdmesg-contents.xml (revision 256)
@@ -1 +1 @@
-groupmodeowner
\ No newline at end of file
+modegroupowner
\ 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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/32setfile.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.SetFile.pkg1.0Main_Package_Elements/Tools/SetFile/.Chameleon/Tools/installTo.pathinstallFrom.isRelativeTypeversionrelocatableparentinstallTo32setfile-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$
\ 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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/05boot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.boot.pkg1.0Main_Package_Elements/i386/boot/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion05boot-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/06boot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.boot0.pkg1.0Main_Package_Elements/i386/boot0/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion06boot-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/01fakesmc.xml (revision 256)
@@ -1 +1 @@
-voodooprojects.org.chameleon.FakeSMC.pkg1.0Main_Package_Elements/Kexts/FakeSMC.kext/.Chameleon/Extra/Extensions/parentinstallTopostInstallrelocatablerequireAuthorizationidentifierversioninstallTo.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/extraFilesinstallTopostInstallrelocatableidentifierrequireAuthorizationparentversioninstallFrom.isRelativeTypeinstallTo.path01fakesmc-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/07boot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.boot0hfs.pkg1.0Main_Package_Elements/i386/boot0hfs/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion07boot-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/08boot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.boot1f32.pkg1.0Main_Package_Elements/i386/boot1f32/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion08boot-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 255)
+++ branches/blackosx/trunk/PackageBuilder/Chameleon_Installer.pmdoc/09boot.xml (revision 256)
@@ -1 +1 @@
-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
+voodooprojects.org.chameleon.boot1h.pkg1.0Main_Package_Elements/i386/boot1h/.Chameleon/i386/installTo.pathinstallFrom.isRelativeTypeinstallToparentrelocatableversion09boot-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$
\ No newline at end of file
Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteInstallerLog.sh
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteInstallerLog.sh (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteInstallerLog.sh (revision 256)
@@ -17,7 +17,7 @@
#echo "DEBUG: passed argument = $verboseText"
fi
-echo "${verboseText}" >> ${logLocation}/Chameleon_Error_Log.txt
+echo "${verboseText}" >> "${logLocation}"/Chameleon_Error_Log.txt
#echo "-----------------------------------------------"
Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 256)
@@ -45,7 +45,7 @@
if [ -f "${3}"/.Chameleon/nullESP ] && ! [ -f "${3}"/.Chameleon/nullstandard ]; then
- # Does an /Extra folder already exist at the target location?
+ # Does an /Extra folder already exist on the target EFI system partition?
# If yes, then make a backup of it
if [ -d "/Volumes/EFI/Extra" ]; then
@@ -87,15 +87,15 @@
echo "==============================================="
-echo "Clean Up"
-echo "********"
+echo "Remove any temporary files"
+echo "**************************"
# 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
+ echo "Executing command: rm -f -R ${3}/.Chameleon/"
+ rm -f -R "${3}"/.Chameleon
fi
# remove the temporary boot sector files if they exist
Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainESPPostinstall.sh
===================================================================
--- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainESPPostinstall.sh (revision 255)
+++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/MainESPPostinstall.sh (revision 256)
@@ -18,7 +18,7 @@
# If they did then the standard install will have already be run.
# Therefore, we will not run this.
-if ! [ -f ${3}/.Chameleon/nullstandard ]; then
+if ! [ -f "${3}"/.Chameleon/nullstandard ]; then
# OK to continue
#echo "==============================================="
@@ -53,31 +53,28 @@
targetDisk=${targetDevice%s*}
targetDiskRaw=${targetDisk/disk/rdisk}
targetSlice=${targetDevice#*disk*s}
- targetResources="${targetVolume%/*}" # - is this needed?
- #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: targetVolumeTemp: Volume is ${targetVolumeTemp}"
- #echo "DEBUG: targetDeviceTemp: Volume device is ${targetDeviceTemp}"
- #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 "DEBUG: targetName: Volume name to look for is ${targetName} - ????????????"
- #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: targetVolumeTemp: Volume is ${targetVolumeTemp}"
+ echo "DEBUG: targetDeviceTemp: Volume device is ${targetDeviceTemp}"
+ 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 "-----------------------------------------------"
+ echo ""
# Check to see if the selected disk uses a GPT
@@ -172,9 +169,9 @@
"$scriptDir"WriteInstallerLog.sh "${targetVolumeTemp}" "Error: ${targetVolumeTemp} is not on a GPT partitioned disc."
fi
else
- echo "Error: User selected both locations for installation"
+ echo "Warning: User selected both locations for installation - So not Continuing with EFI System Partition script"
# Write error to Chameleon_Error_Log file
- "$scriptDir"WriteInstallerLog.sh "${3}" "Error: User selected both locations for installation. Exiting the script for installing to the EFI system partition"
+ "$scriptDir"WriteInstallerLog.sh "${3}" "Warning: User selected both locations for installation. Not continuing with the script for installing to the EFI system partition"
fi
exit 0