Index: branches/blackosx/package/Scripts/Main/Post/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/Post/postinstall (revision 1614) +++ branches/blackosx/package/Scripts/Main/Post/postinstall (revision 1615) @@ -113,7 +113,12 @@ keyToUse=$( echo $keyRead | sed 's/ /\\ /g' ) if [ "${keyToUse}" != "DONT" ] && [ "${value}" != "USE" ]; then sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP" - "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${keyRead}=${value}" + returnValue=$? + if [ ${returnValue} -ne 1 ]; then + "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${keyRead}=${value}" + else + "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${keyRead}=${value} as an option already exists for: ${keyRead}" + fi fi fi (( arrayCount++ )) Index: branches/blackosx/package/Scripts/Sub/CheckFormat.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckFormat.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckFormat.sh (revision 1615) @@ -26,25 +26,18 @@ fi if [ "$( fstyp "$targetDevice" | grep hfs )" ]; then - echo "${targetDevice} is currently formatted as HFS" - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: ${targetDevice} is currently formatted as HFS" #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as HFS" exit 1 fi if [ "$( fstyp "$targetDevice" | grep msdos )" ]; then - echo "${targetDevice} is currently formatted as msdos" - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: ${targetDevice} is currently formatted as msdos" #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as msdos" exit 2 fi -echo "WARNING: ${targetDevice} is currently not formatted as either HFS or msdos" -echo "-----------------------------------------------" -echo "" - +#echo "DEBUG: WARNING: ${targetDevice} is currently not formatted as either HFS or msdos" "$scriptDir"InstallLog.sh "${targetVolume}" "WARNING: ${targetDevice} is currently not formatted as either HFS or msdos" exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/CheckFatType.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckFatType.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckFatType.sh (revision 1615) @@ -32,47 +32,34 @@ partitionBootSector=$( dd 2>/dev/null if="$targetDeviceRaw" count=1 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) if [ "${partitionBootSector:36:2}" == "00" ] && [ "${partitionBootSector:42:2}" == "f8" ] && [ "${partitionBootSector:48:2}" == "3f" ]; then - echo "Found a FAT32 device formatted by Windows Explorer" - echo "--------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT32 device formatted by Windows Explorer" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT32 volume formatted by Windows Explorer" exit 2 fi if [ "${partitionBootSector:36:2}" == "02" ] && [ "${partitionBootSector:42:2}" == "f8" ] && [ "${partitionBootSector:48:2}" == "3f" ]; then - echo "Found a FAT16 device formatted by Windows Explorer" - echo "--------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT16 device formatted by Windows Explorer" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT16 volume formatted by Windows Explorer" exit 1 fi if [ "${partitionBootSector:36:2}" == "00" ] && [ "${partitionBootSector:42:2}" == "f0" ] && [ "${partitionBootSector:48:2}" == "20" ]; then - echo "Found a FAT32 device formatted by OS X Snow Leopard Disk Utility" - echo "----------------------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT32 device formatted by OS X Snow Leopard Disk Utility" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT32 volume formatted by OS X Snow Leopard Disk Utility" exit 2 fi if [ "${partitionBootSector:36:2}" == "02" ] && [ "${partitionBootSector:42:2}" == "f0" ] && [ "${partitionBootSector:48:2}" == "20" ]; then - echo "Found a FAT16 device formatted by OS X Snow Leopard Disk Utility" - echo "----------------------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT16 device formatted by OS X Snow Leopard Disk Utility" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT16 volume formatted by OS X Snow Leopard Disk Utility" exit 1 fi if [ "${partitionBootSector:36:2}" == "00" ] && [ "${partitionBootSector:42:2}" == "f8" ] && [ "${partitionBootSector:48:2}" == "20" ]; then - echo "Found a FAT32 device formatted by OS X Lion Disk Utility" - echo "--------------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT32 device formatted by OS X Lion Disk Utility" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT32 volume formatted by OS X Lion Disk Utility" exit 2 fi if [ "${partitionBootSector:36:2}" == "02" ] && [ "${partitionBootSector:42:2}" == "f8" ] && [ "${partitionBootSector:48:2}" == "20" ]; then - echo "Found a FAT16 device formatted by OS X Lion Disk Utility" - echo "--------------------------------------------------------" - echo "" + #echo "DEBUG: Found a FAT16 device formatted by OS X Lion Disk Utility" "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDeviceRaw} is on a FAT16 volume formatted by OS X Lion Disk Utility" exit 1 fi -echo "-----------------------------------------------" -echo "" + exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/WriteChameleonStage0.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/WriteChameleonStage0.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/WriteChameleonStage0.sh (revision 1615) @@ -39,20 +39,15 @@ if [ ${disksignature} = "0" ]; then # ThereÕs no Windows disk signature so we can write boot0 - echo "Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loader} -y ${targetDisk}" + #echo "DEBUG: Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loader} -y ${targetDisk}" "${targetResources}"fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loader} -y ${targetDisk} "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loader} to ${targetDisk}." else # Windows is also installed on the HDD so we need to write boot0md - echo "Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}" + #echo "DEBUG: Executing command: ${targetResources}fdisk440 -u -f /usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk}" "${targetResources}"fdisk440 -u -f "${targetVolume}"/usr/standalone/i386/${stage0Loaderdualboot} -y ${targetDisk} "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage0Loaderdualboot} to ${targetDisk}." fi - -echo "-----------------------------------------------" -echo "" -echo "" - exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/WriteChameleonStage1.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/WriteChameleonStage1.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/WriteChameleonStage1.sh (revision 1615) @@ -37,7 +37,7 @@ if [ ${espformat} = "1" ]; then # the selected partition is HFS formatted - echo "Executing command: dd if=${selectedDestination}/usr/standalone/i386/${stage1LoaderHFS} of=${targetDeviceRaw}" + #echo "DEBUG: Executing command: dd if=${selectedDestination}/usr/standalone/i386/${stage1LoaderHFS} of=${targetDeviceRaw}" dd if="${selectedDestination}"/usr/standalone/i386/${stage1LoaderHFS} of=${targetDeviceRaw} "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage1LoaderHFS} to ${targetDeviceRaw}." @@ -46,22 +46,19 @@ if [ ${espformat} = "2" ]; then # the selected partition FAT formatted - echo "Executing command: dd if=${targetDeviceRaw} count=1 bs=512 of=/tmp/origbs" + #echo "DEBUG: 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 "${selectedDestination}"/usr/standalone/i386/${stage1LoaderFAT} /tmp/newbs" + #echo "DEBUG: Executing command: cp "${selectedDestination}"/usr/standalone/i386/${stage1LoaderFAT} /tmp/newbs" cp "${selectedDestination}"/usr/standalone/i386/${stage1LoaderFAT} /tmp/newbs - echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc" + #echo "DEBUG: 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" + #echo "DEBUG: Executing command: dd of=${targetDeviceRaw} count=1 bs=512 if=/tmp/newbs" dd if=/tmp/newbs of="${targetDeviceRaw}" count=1 bs=512 "$scriptDir"InstallLog.sh "${targetVolume}" "Written ${stage1LoaderFAT} to ${targetDeviceRaw}." fi -echo "-----------------------------------------------" -echo "" - exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/CheckPartitionScheme.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckPartitionScheme.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckPartitionScheme.sh (revision 1615) @@ -34,38 +34,29 @@ partitiontable=$( dd 2>/dev/null if="$targetDisk" count=1 | dd 2>/dev/null count=64 bs=1 skip=446 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) if [ "${partitiontable:8:2}" == "ee" ]; then - echo "Found System ID 'EE' to identify GPT Partition" + #echo "DEBUG: Found System ID 'EE' to identify GPT Partition" if [ "${partitiontable:40:2}" == "00" ] && [ "${partitiontable:72:2}" == "00" ] && [ "${partitiontable:104:2}" == "00" ]; then - echo "Found System ID '00' for each remaining possible partition" + #echo "DEBUG: Found System ID '00' for each remaining possible partition" partitiontable="GPT" - echo "${partitiontable} found." - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: ${partitiontable} found." #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT." exit 1 else partitiontable="GPT/MBR" - echo "${partitiontable} found." - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: ${partitiontable} found." #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT/MBR." exit 2 fi fi else partitiontable="MBR" - echo "${partitiontable} found." - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: ${partitiontable} found." #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using MBR." exit 3 fi -echo "No partition table found." -echo "-----------------------------------------------" -echo "" - +#echo "DEBUG: No partition table found." "$scriptDir"InstallLog.sh "${targetVolume}" "NOTE: No partition table found." exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh (revision 1615) @@ -37,7 +37,7 @@ #echo "DEBUG: EFI install chosen" if [ ! -d "${selectedDestination}" ]; then - echo "Executing Command: mkdir -p ${selectedDestination}" + #echo "DEBUG: Executing Command: mkdir -p ${selectedDestination}" mkdir -p "${targetVolume}" #else #echo "DEBUG: folder /Volumes/EFI already exists" @@ -59,11 +59,11 @@ mount_msdos -u 0 -g 0 "${targetDevice}" "${selectedDestination}" fi - echo "Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${selectedDestination}" + #echo "DEBUG: Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${selectedDestination}" cp "${targetVolume}"/usr/standalone/i386/"${stage2Loader}" "${selectedDestination}" "$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${selectedDestination}." else - echo "Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${targetVolume}" + #echo "DEBUG: Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${targetVolume}" cp "${targetVolume}"/usr/standalone/i386/"${stage2Loader}" "${targetVolume}" "$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume}." fi @@ -74,8 +74,4 @@ # "${selectedDestination}"/.Chameleon/Resources/SetFile -a V "${targetVolume}"/"${stage2Loader}" #fi -echo "-----------------------------------------------" -echo "" -echo "" - exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh (revision 1615) @@ -49,7 +49,7 @@ # Check bytes 440-443 of the GPTdiskProtectiveMBR for a Windows Disk Signature windowsloader=$( dd 2>/dev/null if="$targetDisk" count=4 bs=1 | xxd | awk '{print $2$3}' ) if [ "${windowsloader}" == "33c08ed0" ] ; then - echo "Found existing Windows Boot Loader so will replace with Chameleon boot0md" + #echo "DEBUG: Found existing Windows Boot Loader so will replace with Chameleon boot0md" "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Windows boot loader - Will replace with boot0md" fi @@ -61,12 +61,12 @@ stage0type=$( dd 2>/dev/null if="$targetDisk" count=3 bs=1 skip=105 | xxd | awk '{print $2$3}' ) if [ "${stage0type}" == "0b807c" ]; then - echo "Target has existing Chameleon stage 0 loader - Boot0hfs" + #echo "DEBUG: Target has existing Chameleon stage 0 loader - Boot0hfs" "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0hfs" # Script CheckDiskSignature.sh returned 0 if a Windows installation was NOT found if [ "$diskSigCheck" == "0" ]; then - echo "Found no existing Windows installation so will replace stage 0 loader with Boot0" + #echo "DEBUG: Found no existing Windows installation so will replace stage 0 loader with Boot0" "$scriptDir"InstallLog.sh "${targetVolume}" "Will replace boot0hfs with boot0 as Windows is not on target disk." exit 0 fi @@ -74,12 +74,12 @@ fi if [ "${stage0type}" == "0a803c" ]; then - echo "Found existing Chameleon stage 0 loader - Boot0" + #echo "DEBUG: Found existing Chameleon stage 0 loader - Boot0" "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0" # Script CheckDiskSignature.sh returned 1 if a Windows installation was found if [ "$diskSigCheck" = "1" ]; then - echo "Found existing Windows installation so will replace stage 0 loader with boot0md" + #echo "DEBUG: Found existing Windows installation so will replace stage 0 loader with boot0md" "$scriptDir"InstallLog.sh "${targetVolume}" "Will replace boot0 with boot0md as Windows is on target disk." exit 0 fi @@ -87,20 +87,19 @@ fi if [ "${stage0type}" == "ee7505" ]; then - echo "Found existing Chameleon stage 0 loader - Boot0md" - echo "And will leave boot0md installed." + #echo "DEBUG: Found existing Chameleon stage 0 loader - Boot0md" + #echo "DEBUG: And will leave boot0md installed." "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0md. Leaving as is." exit 1 fi if [ "${stage0type}" != "0b807c" ] && [ "${stage0type}" != "0a803c" ] && [ "${stage0type}" != "ee7505" ] && [ "${windowsloader}" != "33c08ed0" ] ; then - echo "Something other than Chameleon or a Windows bootloader was found" + #echo "DEBUG: Something other than Chameleon or a Windows bootloader was found" test=$(echo "${mbr437}" | awk -F0 '{print NF-1}' ) - echo "Disk microcode found: ${test} - Preserving." - echo "diskupdate is set to false" - echo "-----------------------------------------------" + #echo "DEBUG: Disk microcode found: ${test} - Preserving." + #echo "DEBUG: diskupdate is set to false" + #echo "DEBUG: -----------------------------------------------" "$scriptDir"InstallLog.sh "${targetVolume}" "NOTE: Target has existing unrecognised bootcode in the MBR. Leaving as is." - echo "" exit 1 fi fi Index: branches/blackosx/package/Scripts/Sub/CheckProceed.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckProceed.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckProceed.sh (revision 1615) @@ -38,8 +38,8 @@ echo "*** Cannot find the volume. Exiting." "$scriptDir"InstallLog.sh "${installerVolume}" "FAIL: Cannot file the volume: $targetVolume." exit 1 -else - echo "Confirming target volume exists" +#else + #echo "DEBUG: Confirming target volume exists" fi @@ -48,8 +48,8 @@ echo "*** ERROR Volume does not use slices. Exiting." "$scriptDir"InstallLog.sh "${installerVolume}" "FAIL: $targetVolume doesn't use slices." exit 1 -else - echo "Confirming target device uses slices" +#else + #echo "DEBUG: Confirming target device uses slices" fi @@ -62,7 +62,7 @@ stripped=$( echo ${stripped%s*})"s1" fi if [ ! $( diskutil list | grep ${stripped} | awk {'print $2'} ) = "EFI" ]; then - echo "*** The selected volume doesn't have an EFI System Partition. Exiting." + #echo "DEBUG: *** The selected volume doesn't have an EFI System Partition. Exiting." "$scriptDir"InstallLog.sh "${installerVolume}" "FAIL: Selected disk does not have an EFI System Partition." exit 1 fi @@ -71,7 +71,7 @@ # Check for existing Chameleon installations on a different # partition of the same target disk. -echo "Checking for existing Chameleon installations on ${targetDisk#/dev/}..." +#echo "DEBUG: Checking for existing Chameleon installations on ${targetDisk#/dev/}..." sliceNumber=$( echo ${targetDeviceRaw#*disk*s} ) # strip slice from end @@ -93,44 +93,40 @@ # Check for existing stage 0 boot file from CheckDiskMicrocode.sh script stage0type=$( dd 2>/dev/null if="$targetDisk" count=3 bs=1 skip=105 | xxd | awk '{print $2$3}' ) if [ "${stage0type}" == "0b807c" ] || [ "${stage0type}" == "0a803c" ] || [ "${stage0type}" == "ee7505" ]; then - echo "boot0 found on $targetDisk" + #echo "DEBUG: boot0 found on $targetDisk" (( stageExistence++ )) fi # Check for boot1h and boot1f32 boot1hSearch=$( dd 2>/dev/null if="$targetDiskRaw" count=1 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) if [ "${boot1hSearch:0:16}" == "fa31c08ed0bcf0ff" ]; then - echo "boot1h found on "$targetDiskRaw + #echo "DEBUG: boot1h found on "$targetDiskRaw (( stageExistence++ )) elif [ "${boot1hSearch:0:4}" == "e962" ] && [ "${boot1hSearch:180:12}" == "424f4f542020" ]; then - echo "boot1f32 found on "$targetDiskRaw + #echo "DEBUG: boot1f32 found on "$targetDiskRaw (( stageExistence++ )) fi # Check for existing stage 2 boot file also if [ -e "$( df | grep $targetDisk"s"$i | awk '{ print $6 }' )"/boot ]; then - echo "boot found on $targetDiskRaw" + #echo "DEBUG: boot found on $targetDiskRaw" (( stageExistence++ )) fi if [ $stageExistence == 3 ] && [ $i -ne $sliceNumber ]; then - echo "STOP: Not recommended you install to $targetDeviceRaw as there is already an existing Chameleon installation on $targetDiskRaw" - "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: Not recommended you install to $targetDeviceRaw as there is already an existing Chameleon installation on $targetDiskRaw." - echo "================================" - echo "End" - echo "--------------------------------" + #echo "DEBUG: STOP: There is already an existing Chameleon installation on $targetDiskRaw" + "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: There is already an existing Chameleon installation on $targetDiskRaw." + "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: You could continue to install to $targetDeviceRaw, but you will have to" + "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: control which partition is loaded by flagging the required partition active." + "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: For now, please proceed by installing Chameleon manually." exit 1 fi done -else - echo "Just one slice" +#else + #echo "DEBUG: Just one slice" fi - -echo "-----------------------------------------------" -echo "" - #"$scriptDir"InstallLog.sh "${installerVolume}" "CheckProceed: PASS" exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/SetActivePartition.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/SetActivePartition.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/SetActivePartition.sh (revision 1615) @@ -58,12 +58,8 @@ # TO DO # Add check to make sure that the active partition is actually the Windows partition # before printing next statement. - #echo "Windows is installed so we let that remain the active partition" + #echo "DEBUG: Windows is installed so we let that remain the active partition" "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is installed so that can remain the active partition" fi -echo "-----------------------------------------------" -echo "" -echo "" - exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/CheckGRUBLinuxLoader.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckGRUBLinuxLoader.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckGRUBLinuxLoader.sh (revision 1615) @@ -28,7 +28,7 @@ diskmicrocodetype[2]="LILO,4c494c4f" diskmicrocode=$( dd 2>/dev/null if="$targetDisk" count=1 | dd 2>/dev/null count=1 bs=437 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) -#echo "${diskmicrocode}" +#echo "DEBUG: ${diskmicrocode}" diskmicrocodetypecounter=0 while [ ${diskmicrocodetypecounter} -lt ${#diskmicrocodetype[@]} ]; do @@ -38,13 +38,9 @@ echo "${diskmicrocodetype[${diskmicrocodetypecounter}]%,*} found." "$scriptDir"InstallLog.sh "${targetVolume}" "FAIL: Found an exisitng GRUB/LILO bootloader in the MBR." exit 1 - else - echo "Didn't find a match for ${diskmicrocodetype[${diskmicrocodetypecounter}]%,*}" + #else + #echo "DEBUG: Didn't find a match for ${diskmicrocodetype[${diskmicrocodetypecounter}]%,*}" fi done -echo "-----------------------------------------------" -echo "" -#"$scriptDir"InstallLog.sh "${targetVolume}" "GRUB/LILO: PASS" - exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1615) @@ -23,27 +23,18 @@ # be unmounted in which case the loop would run forever. attempts=1 while [ "$( df | grep EFI )" ] && [ $attempts -lt 5 ]; do - echo "Unmounting $( df | grep EFI | awk '{print $1}' )" + #echo "DEBUG: Unmounting $( df | grep EFI | awk '{print $1}' )" "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Find and unmount any volume named 'EFI':" "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "$( df | grep EFI | awk '{print $1}' )" umount -f $( df | grep EFI | awk '{print $1}' ) (( attempts++ )) done if [ $attempts = 5 ]; then - echo "failed to unmount 'EFI' System Partition." - echo "-----------------------------------------------" + #echo "DEBUG: failed to unmount 'EFI' System Partition." "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Failed to unmount 'EFI' System Partition." - echo "" - echo "" - echo "" exit 1 fi -echo "-----------------------------------------------" -echo "" -echo "" -echo "" - exit 0 Index: branches/blackosx/package/Scripts/Sub/CheckWindowsDiskSignature.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckWindowsDiskSignature.sh (revision 1614) +++ branches/blackosx/package/Scripts/Sub/CheckWindowsDiskSignature.sh (revision 1615) @@ -25,22 +25,15 @@ disksignature=$( dd 2>/dev/null if="$targetDisk" count=1 | dd 2>/dev/null count=4 bs=1 skip=440 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) -#echo "${disksignature}" +#echo "DEBUG: ${disksignature}" if [ "${disksignature}" = "00000000" ]; then - echo "No Windows installation detected." - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: No Windows installation detected." exit 0 else - echo "Detected an existing Windows installation" - echo "-----------------------------------------------" - echo "" + #echo "DEBUG: Detected an existing Windows installation" "$scriptDir"InstallLog.sh "${targetVolume}" "Detected a Windows installation on this volume." exit 1 fi -echo "-----------------------------------------------" -echo "" - exit 0 \ No newline at end of file