Index: branches/blackosx/package/Scripts/Standard/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Standard/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Standard/postinstall (revision 1566)
@@ -144,7 +144,7 @@
else
# Continue if the selected device is not a FAT16 format device
- # Append a link break to the installer log
+ # Append a line break to the installer log
"$scriptDir"InstallLog.sh "${targetVolume}" "Line Break"
if [ ${diskupdate} = "0" ]; then
@@ -161,7 +161,7 @@
# Write the stage 2 loader to the root of the selected partition
"$scriptDir"WriteChameleonStage2.sh "${espformat}" "${stage2Loader}" "${3}" "${targetDevice}" "${targetVolume}" "${scriptDir}"
- # Append a link break to the installer log
+ # Append a line break to the installer log
"$scriptDir"InstallLog.sh "${targetVolume}" "Line Break"
# Set the active partition ONLY if Windows is not installed
Index: branches/blackosx/package/Scripts/EFI/postinstall
===================================================================
--- branches/blackosx/package/Scripts/EFI/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/EFI/postinstall (revision 1566)
@@ -73,7 +73,7 @@
# Write some information to the Install Log
versionNumber=`cat "${scriptDir}"/Resources/version`
revisionNumber=`cat "${scriptDir}"/Resources/revision`
-"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Chameleon installer version: ${versionNumber} ${revisionNumber}"
+"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Installer version: ${versionNumber} ${revisionNumber}"
"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Running EFI postinstall script
Target volume selected by user = ${targetVolumeChosenByUser}
Target volume = ${targetVolume}"
@@ -87,7 +87,7 @@
if [ ${partitiontable} = "GUID_partition_scheme" ]; then
echo "Confirm this is a GPT partitioned disk."
- # Double check we can see the selected partition, it's of the right type and /Volumes/EFI exists.
+ # Double check we can see the selected partition, it's of the right type and /Volumes/TempChamESP exists.
"$scriptDir"CheckProceed.sh "${targetVolume}" "${targetDeviceChosenByUser}" "${targetVolumeChosenByUser}" "${scriptDir}"
returnValue=$?
@@ -144,6 +144,9 @@
if [ ${returnValue} = 0 ]; then
# OK to proceed
+ # Append a line break to the installer log
+ "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Line Break"
+
if [ ${diskupdate} = "0" ]; then
#echo "Diskupdate = true, so the stage 0 loader can be written to the MBR"
@@ -160,6 +163,9 @@
# Write the stage 2 loader to the root of the selected partition
"$scriptDir"WriteChameleonStage2.sh "${espformat}" "${stage2Loader}" "${targetVolume}" "${targetDevice}" "${targetVolumeChosenByUser}" "${scriptDir}"
+ # Append a line break to the installer log
+ "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Line Break"
+
# Set the active partition ONLY if Windows is not installed
"$scriptDir"SetActivePartition.sh "${espformat}" "${diskSigCheck}" "${targetDiskRaw}" "${targetSlice}" "${targetVolumeChosenByUser}" "${scriptDir}"
fi
Index: branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/GUI/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/Wake/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Wake/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/Wake/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/Npci/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Npci/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/Npci/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/Wait/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Wait/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/Wait/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Post/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Post/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Post/postinstall (revision 1566)
@@ -17,11 +17,11 @@
echo "preinstall: Path to dest volume..... $3"
echo "preinstall: Root of system folder... $4"
-set -x
+#set -x # Useful for echoing everything the script does to the installer log!!
if [ ! -e "$3" ]
then
- echo "destination volume does not exist!"
+ echo "$3 volume does not exist!"
exit 1
fi
@@ -33,28 +33,36 @@
dest_vol="$3"
fi
-# check to see if EFI system partition install option was chosen.
-# if so, unmount /Volumes/EFI
+# Extra folder now resides in /tmpcham.
+# Copy /tmpcham/Extra to correct location.
+if [ ! -f "$dest_vol"/.ChameleonEFI ]; then
+ echo "Copying $dest_vol/tmpcham/Extra/* $dest_vol/Extra"
+ cp -R "$dest_vol"/tmpcham/Extra/* "$dest_vol"/Extra
+else
+ echo "Copying $dest_vol/tmpcham/Extra/* $dest_vol/Volumes/EFI/Extra"
+ cp -R "$dest_vol"/tmpcham/Extra/* /Volumes/EFI/Extra
-if [ -f "$dest_vol"/.ChameleonEFI ]; then
- attempts=1
- while [ "$( df | grep EFI )" ] && [ "${attempts}" -lt 5 ]; do
- echo "Unmounting $( df | grep EFI | awk '{print $1}' )"
- umount -f $( df | grep EFI | awk '{print $1}' )
- attempts=$(( ${attempts} + 1 ))
- done
+ # unmount /Volumes/EFI
+ attempts=1
+ while [ "$( df | grep EFI )" ] && [ "${attempts}" -lt 5 ]; do
+ echo "Unmounting $( df | grep EFI | awk '{print $1}' )"
+ umount -f $( df | grep EFI | awk '{print $1}' )
+ attempts=$(( ${attempts} + 1 ))
+ done
- # Remove /.ChameleonEFI file
- rm "$dest_vol"/.ChameleonEFI
+ # Remove /.ChameleonEFI file
+ echo "Removing /.ChameleonEFI file"
+ rm "$dest_vol"/.ChameleonEFI
fi
# Remove /.ChameleonLogFlag file
if [ -f "$dest_vol"/.ChameleonLogFlag ]; then
+ echo "Removing /.ChameleonLogFlag file"
rm "$dest_vol"/.ChameleonLogFlag
fi
# delete the temporary Chameleon folder
-
+echo "Removing $dest_vol/tmpcham file"
rm -rf "$dest_vol/tmpcham"
Index: branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1566)
@@ -17,9 +17,12 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
-
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
Index: branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1566)
@@ -18,6 +18,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/arch/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/arch/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/arch/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Install/CheckProceed.sh
===================================================================
--- branches/blackosx/package/Scripts/Install/CheckProceed.sh (revision 1565)
+++ branches/blackosx/package/Scripts/Install/CheckProceed.sh (revision 1566)
@@ -6,7 +6,7 @@
# Checks the selected volume is present and the disk is partitioned.
-# Receives targetVolume: Volume to install to (Will be '/Volumes/EFI' if EFI install)
+# Receives targetVolume: Volume to install to (will be '/Volumes/EFI' if EFI install)
# Receives targetDevice: Stores device number, for example /dev/disk2s1.
# Receives installerVolume: Volume to write the installer log to.
# Receives scriptDir: The location of the main script dir.
Index: branches/blackosx/package/Scripts/Install/UnMountEFIvolumes.sh
===================================================================
--- branches/blackosx/package/Scripts/Install/UnMountEFIvolumes.sh (revision 1565)
+++ branches/blackosx/package/Scripts/Install/UnMountEFIvolumes.sh (revision 1566)
@@ -4,7 +4,7 @@
echo "Unmount all volumes named EFI"
echo "*****************************"
-# loop through and un-mount ALL mounted EFI system partitions - Thanks kizwan
+# loop through and un-mount ALL mounted 'EFI' system partitions - Thanks kizwan
# Receives scriptDir: The location of the main script dir.
# Receives targetVolumeTemp: Stores original target if EFI install selected.
@@ -27,9 +27,9 @@
attempts=$(( ${attempts} + 1 ))
done
if [ ${attempts} = 5 ]; then
- echo "failed to unmount EFI System Partition."
+ echo "failed to unmount 'EFI' System Partition."
echo "-----------------------------------------------"
- "$scriptDir"InstallLog.sh "${targetVolumeTemp}" "Failed to unmount EFI System Partition."
+ "$scriptDir"InstallLog.sh "${targetVolumeTemp}" "Failed to unmount 'EFI' System Partition."
echo ""
echo ""
echo ""
Index: branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1566)
@@ -17,9 +17,12 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
-
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
Index: branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall (revision 1566)
@@ -6,8 +6,24 @@
import shutil
vol = str(sys.argv[3])
-boot = "/Extra/org.chameleon.Boot.plist"
-plist = vol + boot
+
+# Check for .ChameleonEFI file at root of target volume
+# to indicate user wants to install to EFI system partition.
+espfile = "/.ChameleonEFI"
+espvol = vol + espfile
+if os.path.exists(espvol):
+ if not os.path.exists('/Volumes/EFI/Extra'):
+ os.makedirs('/Volumes/EFI/Extra')
+
+ plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
+else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
+ boot = "/Extra/org.chameleon.Boot.plist"
+ plist = vol + boot
+
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
Index: branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/Scripts/Keymaps/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Keymaps/postinstall (revision 1565)
+++ branches/blackosx/package/Scripts/Keymaps/postinstall (revision 1566)
@@ -17,6 +17,10 @@
plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
else:
+ extrafolder = vol + "/Extra"
+ if not os.path.exists(extrafolder):
+ os.makedirs(extrafolder)
+
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh (revision 1565)
+++ branches/blackosx/package/buildpkg.sh (revision 1566)
@@ -98,8 +98,8 @@
cp -f ${pkgroot}/Scripts/EFI/* ${1}/EFI/Scripts
cp -f ${pkgroot}/Scripts/Install/* ${1}/EFI/Scripts
ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Resources/SetFile
- ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/Standard/Scripts/Resources/revision
- ditto --noextattr --noqtn ${1%/*/*}/version ${1}/Standard/Scripts/Resources/version
+ ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/EFI/Scripts/Resources/revision
+ ditto --noextattr --noqtn ${1%/*/*}/version ${1}/EFI/Scripts/Resources/version
echo " [BUILD] EFI "
buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
# End build efi package
@@ -132,7 +132,7 @@
mkdir -p ${1}/klibc/Root
ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/klibc/Root
echo " [BUILD] klibc "
- buildpackage "${1}/klibc" "/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1
+ buildpackage "${1}/klibc" "/tmpcham/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 #blackosx = add tmpcham to path
}
fi
# -
@@ -141,26 +141,26 @@
mkdir -p ${1}/AutoReso/Root
ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/AutoReso/Root
echo " [BUILD] Resolution "
- buildpackage "${1}/AutoReso" "/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1
+ buildpackage "${1}/AutoReso" "/tmpcham/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1 #blackosx = add tmpcham to path
}
fi
# -
if [ -e ${1%/*}/i386/modules/Keylayout.dylib ]; then
{
- mkdir -p ${1}/Keylayout/Root/Extra/{modules,Keymaps}
- mkdir -p ${1}/Keylayout/Root/usr/bin
- layout_src_dir="${1%/sym/*}/i386/modules/Keylayout/layouts/layouts-src"
- if [ -d "$layout_src_dir" ];then
- # Create a tar.gz from layout sources
- (cd "$layout_src_dir"; \
- tar czf "${1}/Keylayout/Root/Extra/Keymaps/layouts-src.tar.gz" README *.slt)
- fi
- # Adding module
- ditto --noextattr --noqtn ${1%/*}/i386/modules/Keylayout.dylib ${1}/Keylayout/Root/Extra/modules
- # Adding Keymaps
- ditto --noextattr --noqtn ${1%/sym/*}/Keymaps ${1}/Keylayout/Root/Extra/Keymaps
- # Adding tools
- ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/Keylayout/Root/usr/bin
+ mkdir -p ${1}/Keylayout/Root/tmpcham/Extra/{modules,Keymaps} #blackosx = add tmpcham to path
+ mkdir -p ${1}/Keylayout/Root/usr/bin
+ layout_src_dir="${1%/sym/*}/i386/modules/Keylayout/layouts/layouts-src"
+ if [ -d "$layout_src_dir" ];then
+ # Create a tar.gz from layout sources
+ (cd "$layout_src_dir"; \
+ tar czf "${1}/Keylayout/Root/tmpcham/Extra/Keymaps/layouts-src.tar.gz" README *.slt) #blackosx = add tmpcham to path
+ fi
+ # Adding module
+ ditto --noextattr --noqtn ${1%/*}/i386/modules/Keylayout.dylib ${1}/Keylayout/Root/tmpcham/Extra/modules #blackosx = add tmpcham to path
+ # Adding Keymaps
+ ditto --noextattr --noqtn ${1%/sym/*}/Keymaps ${1}/Keylayout/Root/tmpcham/Extra/Keymaps #blackosx = add tmpcham to path
+ # Adding tools
+ ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/Keylayout/Root/usr/bin
echo " [BUILD] Keylayout "
buildpackage "${1}/Keylayout" "/" "" "start_selected=\"true\"" >/dev/null 2>&1
}
@@ -172,7 +172,7 @@
ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/uClibc/Root
ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/uClibc/Root
echo " [BUILD] uClibc++ "
- buildpackage "${1}/uClibc" "/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1
+ buildpackage "${1}/uClibc" "/tmpcham/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 #blackosx = add tmpcham to path
}
fi
((xmlindent--))
@@ -189,45 +189,6 @@
# End build Chameleon package
# build Extras package
- #echo "================= Extras ================="
- #outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- #choices[$((choicescount++))]="\n\n"
- #((xmlindent++))
- #packagesidentity="org.chameleon.extras"
-
- # build utility package
- # outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- # choices[$((choicescount++))]="\n\n"
- # ((xmlindent++))
- # packagesidentity="org.chameleon.utilities"
-
- # # build package for Chameleon PrefPanel
- # mkdir -p "${1}/PrefPanel/Root"
- # ditto --noextattr --noqtn "${pkgroot}/Configuration/PrefPanel/Chameleon.prefPane" "${1}/PrefPanel/Root"
- # echo " [BUILD] Chameleon Preference Panel "
- # buildpackage "${1}/PrefPanel" "/Library/PreferencePanes/Chameleon.prefPane" "" "start_selected=\"false\"" >/dev/null 2>&1
- # # End build package for Chameleon PrefPanel
-
- # # build package for SMBIOSDefault
- # mkdir -p "${1}/SMBIOSDefault/Root"
- # ditto --noextattr --noqtn "${pkgroot}/Configuration/SMBIOSDefault/smbios.plist" "${1}/SMBIOSDefault/Root"
- # echo " [BUILD] SMBIOSDefault "
- # buildpackage "${1}/SMBIOSDefault" "/Extra/Example" "" "start_selected=\"false\"" >/dev/null 2>&1
- # # End build package for SMBIOSDefault
-
- # # build package for Documentation
- # mkdir -p "${1}/Documentation/Root"
- # cp -f ${pkgroot}/../doc/BootHelp.txt ${1}/Documentation/Root
- # cp -f ${pkgroot}/../doc/README ${1}/Documentation/Root
- # cp -f ${pkgroot}/../doc/Users_Guide0.5.pdf ${1}/Documentation/Root
- # echo " [BUILD] Documentation "
- # buildpackage "${1}/Documentation" "/Library/Documentation/Chameleon2" "" "start_selected=\"false\"" >/dev/null 2>&1
- # # End build package for Documentation
-
- # ((xmlindent--))
- # outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- # End utility package
-
# build options packages
echo "================= Options ================="
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
@@ -262,7 +223,8 @@
sed "s/@@KEYMAP@@/${keymaps[$i]}/g" "${pkgroot}/Scripts/Keymaps/postinstall" > "${1}/${keymaps[$i]}/Scripts/postinstall" && \
chmod +rx "${1}/${keymaps[$i]}/Scripts/postinstall"
echo " [BUILD] ${keymaps[$i]} "
- buildpackage "${1}/${keymaps[$i]}" "/tmpcham" "" "start_selected=\"false\"" >/dev/null 2>&1
+#blackosx = why use install location /tmpcham for this ? changing to root
+ buildpackage "${1}/${keymaps[$i]}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
done
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
@@ -281,7 +243,8 @@
mkdir -p "${1}/${resolutions[$i]##*/}/Scripts/"
ditto --noextattr --noqtn "${resolutions[$i]}/postinstall" "${1}/${resolutions[$i]##*/}/Scripts/postinstall"
echo " [BUILD] ${resolutions[$i]##*/} "
- buildpackage "${1}/${resolutions[$i]##*/}" "/tmpcham" "" "start_selected=\"false\"" >/dev/null 2>&1
+#blackosx = why use install location /tmpcham for this ? changing to root
+ buildpackage "${1}/${resolutions[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
done
((xmlindent--))
@@ -311,7 +274,6 @@
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
-
# End build options packages
# build theme packages
@@ -330,7 +292,8 @@
mkdir -p "${1}/${theme}/Root/"
rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
echo " [BUILD] ${theme}"
- buildpackage "${1}/${theme}" "/Extra/Themes" "" "start_selected=\"false\"" >/dev/null 2>&1
+#blackosx = maybe use install location /tmpcham for this, then move at the end depending on standard to efi install? going to try it
+ buildpackage "${1}/${theme}" "/tmpcham/Extra/Themes" "" "start_selected=\"false\"" >/dev/null 2>&1
done
((xmlindent--))
@@ -356,7 +319,7 @@
# clean up
- rm -R -f "${1}"
+ #rm -R -f "${1}"
}
@@ -397,7 +360,7 @@
header+="auth=\"root\">\n"
header+="\t\n"
- rm -R -f "${1}/Temp"
+ #rm -R -f "${1}/Temp"
[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"
[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"
@@ -416,6 +379,7 @@
fi
header+=""
+ echo -e "${header}" >> ~/Desktop/header
echo -e "${header}" > "${1}/Temp/PackageInfo"
pushd "${1}/Root" >/dev/null
find . -print | cpio -o -z -H cpio > "../Temp/Payload"
@@ -433,7 +397,7 @@
fi
choices[$((choicescount++))]="\n\t#${packagename// /}.pkg\n\n"
- rm -R -f "${1}"
+ #rm -R -f "${1}"
fi
}