Index: branches/blackosx/package/Scripts/Main/ESPpostinstall =================================================================== --- branches/blackosx/package/Scripts/Main/ESPpostinstall (revision 1748) +++ branches/blackosx/package/Scripts/Main/ESPpostinstall (revision 1749) @@ -170,7 +170,7 @@ # Check for another existing Chameleon installation on the same disk "$scriptDir"InstallLog.sh "${targetVolume}" "LineBreak" - "$scriptDir"InstallLog.sh "${targetVolume}" "About to check target disk for previous installations." + "$scriptDir"InstallLog.sh "${targetVolume}" "Preparing to check target disk for previous installations." "$scriptDir"CheckPreviousChameleon.sh "${targetDisk}" "${targetDeviceRaw}" "${targetDevice}" "${targetVolumeChosenByUser}" "${scriptDir}" fi Index: branches/blackosx/package/Scripts/Main/Standardpostinstall =================================================================== --- branches/blackosx/package/Scripts/Main/Standardpostinstall (revision 1748) +++ branches/blackosx/package/Scripts/Main/Standardpostinstall (revision 1749) @@ -170,7 +170,7 @@ # Next we look to check for existing Chameleon installations. "$scriptDir"InstallLog.sh "${targetVolume}" "LineBreak" - "$scriptDir"InstallLog.sh "${targetVolume}" "About to check target disk for previous installations." + "$scriptDir"InstallLog.sh "${targetVolume}" "Preparing to check target disk for previous installations." if [ ${efiPartitionExist} -ne 0 ]; then # volume has an EFI system partition "$scriptDir"InstallLog.sh "${targetVolume}" "Going to check the EFI system partition also." # Unmount ALL mounted volumes named EFI. Returns 0=success, 1=fail Index: branches/blackosx/package/Scripts/Sub/CheckPreviousChameleon.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckPreviousChameleon.sh (revision 1748) +++ branches/blackosx/package/Scripts/Sub/CheckPreviousChameleon.sh (revision 1749) @@ -52,8 +52,7 @@ # if there is more than one partition on the disk. # =============================================== if [ $numSlices -gt 1 ]; then - "$scriptDir"InstallLog.sh "${installerVolume}" "LineBreak" - "$scriptDir"InstallLog.sh "${installerVolume}" "Checking for previous chameleon installations on ${targetDisk#/dev/}" + "$scriptDir"InstallLog.sh "${installerVolume}" "Checking ${targetDisk#/dev/}." # Check the disk's MBR for existing stage 0 boot code (code from CheckDiskMicrocode.sh script) stage0type=$( dd 2>/dev/null if="$targetDisk" count=3 bs=1 skip=105 | xxd | awk '{print $2$3}' ) @@ -64,6 +63,7 @@ fi #Scan all partitions for Chameleon code + cleanRun=1 for (( i=1; i <= $numSlices; i++ )); do if [ $stage0type == 1 ] || [ $stage0type == 2 ]; then @@ -108,7 +108,7 @@ "$scriptDir"InstallLog.sh "${installerVolume}" "${message}" fi if [ $stagesFound == 3 ] && [ $i -gt $sliceNumber ]; then - # Exisitng installation found which will no longer be default. + # Existing installation found which will no longer be default. message="NOTE: There is an existing Chameleon installation on $targetDiskRaw NOTE: but this installation on $targetDevice will be the default loader NOTE: because you're installing to an earlier partition on the disk." @@ -173,9 +173,13 @@ #echo "DEBUG: Boot0 not found" fi fi + else + (( cleanRun++ )) fi - done + if [[ $cleanRun == $i ]]; then + "$scriptDir"InstallLog.sh "${installerVolume}" "Nothing found that could cause any problems." + fi else "$scriptDir"InstallLog.sh "${installerVolume}" "Nothing to check as there's only one partition." fi Index: branches/blackosx/package/Scripts/Sub/MountESP.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/MountESP.sh (revision 1748) +++ branches/blackosx/package/Scripts/Sub/MountESP.sh (revision 1749) @@ -37,11 +37,11 @@ # Mount '/Volumes/EFI' using the correct format type if [ "$( fstyp "${targetDisk}"s1 | grep hfs )" ]; then - "$scriptDir"InstallLog.sh "${installerVolume}" "Mounting ${targetDisk}s1 as /Volumes/EFI" + "$scriptDir"InstallLog.sh "${installerVolume}" "Mounting ${targetDisk}s1 as /Volumes/EFI." mount_hfs "${targetDisk}"s1 "/Volumes/EFI" fi if [ "$( fstyp "${targetDisk}"s1 | grep msdos )" ]; then - "$scriptDir"InstallLog.sh "${installerVolume}" "Mounting ${targetDisk}s1 as /Volumes/EFI" + "$scriptDir"InstallLog.sh "${installerVolume}" "Mounting ${targetDisk}s1 as /Volumes/EFI." mount_msdos -u 0 -g 0 "${targetDisk}"s1 "/Volumes/EFI" fi else