Index: branches/blackosx/package/Scripts/Standard/postinstall =================================================================== --- branches/blackosx/package/Scripts/Standard/postinstall (revision 1562) +++ branches/blackosx/package/Scripts/Standard/postinstall (revision 1563) @@ -70,7 +70,7 @@ # Write some information to the Install Log versionNumber=`cat "${scriptDir}"/Resources/version` revisionNumber=`cat "${scriptDir}"/Resources/revision` -"$scriptDir"InstallLog.sh "${targetVolume}" "Chameleon installer version: ${versionNumber} ${revisionNumber}" +"$scriptDir"InstallLog.sh "${targetVolume}" "Installer version: ${versionNumber} ${revisionNumber}" "$scriptDir"InstallLog.sh "${targetVolume}" "Running Standard postinstall script Target volume = ${targetVolume}" @@ -144,13 +144,14 @@ else # Continue if the selected device is not a FAT16 format device + # Append a link break to the installer log + "$scriptDir"InstallLog.sh "${targetVolume}" "Line Break" + if [ ${diskupdate} = "0" ]; then - echo "Diskupdate = true, so the stage 0 loader can be written to the MBR" - # Write the stage 0 loader to the MBR "$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetResources}" "${targetVolume}" "${scriptDir}" else - echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR." + #echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR." "$scriptDir"InstallLog.sh "${targetVolume}" "Stage 0 loader not written to ${targetDisk}." fi @@ -160,12 +161,18 @@ # 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 + "$scriptDir"InstallLog.sh "${targetVolume}" "Line Break" + # Set the active partition ONLY if Windows is not installed "$scriptDir"SetActivePartition.sh "${espformat}" "${diskSigCheck}" "${targetDiskRaw}" "${targetSlice}" "${targetVolume}" "${scriptDir}" fi fi fi +"$scriptDir"InstallLog.sh "${targetVolume}" "Line Break" +"$scriptDir"InstallLog.sh "${targetVolume}" "Standard script complete" + echo "===============================================" echo "END - Standard Post-Install Script" echo "*********************************" Index: branches/blackosx/package/Scripts/EFI/postinstall =================================================================== --- branches/blackosx/package/Scripts/EFI/postinstall (revision 1562) +++ branches/blackosx/package/Scripts/EFI/postinstall (revision 1563) @@ -188,6 +188,9 @@ # boot option scripts than EFI (ESP) option was chosen echo "EFI" >"${targetVolumeChosenByUser}"/.ChameleonEFI +"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Line Break" +"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "EFI script complete" + echo "===============================================" echo "END - Main EFI System Partition Post-Install Script" echo "*********************************************" Index: branches/blackosx/package/Scripts/Install/CheckFormat.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckFormat.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/CheckFormat.sh (revision 1563) @@ -29,7 +29,7 @@ echo "${targetDevice} is currently formatted as HFS" echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as HFS" + #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as HFS" exit 1 fi @@ -37,7 +37,7 @@ echo "${targetDevice} is currently formatted as msdos" echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as msdos" + #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDevice} is currently formatted as msdos" exit 2 fi Index: branches/blackosx/package/Scripts/Install/InstallLog.sh =================================================================== --- branches/blackosx/package/Scripts/Install/InstallLog.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/InstallLog.sh (revision 1563) @@ -41,17 +41,33 @@ # of Chameleon package. echo "Chameleon installer log - $( date ) ------------------------------------------------------- ${verboseText} -------------------------------------------------------" >"${logFile}" +====================================================== +" >"${logFile}" diskutil list >>"${logFile}" - echo "------------------------------------------------------" >>"${logFile}" + echo " +====================================================== +" >>"${logFile}" # Create /.ChameleonLogFlag file. echo "Log" >"${logLocation}"/.ChameleonLogFlag else # Append messages to the log as passed by other scripts. - echo "${verboseText}" >> "${logFile}" + if [ "${verboseText}" = "Line Break" ]; then + echo " +====================================================== +" >>"${logFile}" + fi + + if [[ "${verboseText}" == *fdisk* ]]; then + targetDiskRaw="${verboseText#fdisk *}" + fdisk $targetDiskRaw >>"${logFile}" + echo " " >>"${logFile}" + fi + + if [ "${verboseText}" != "Line Break" ] && [[ "${verboseText}" != *fdisk* ]]; then + echo "${verboseText}" >> "${logFile}" + fi fi exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh (revision 1563) @@ -32,22 +32,24 @@ partitiontable=$( dd 2>/dev/null if="$targetDisk" count=1 skip=1 | dd 2>/dev/null count=8 bs=1 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) if [ "${partitiontable:0:16}" == "4546492050415254" ]; then 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" + if [ "${partitiontable:40:2}" == "00" ] && [ "${partitiontable:72:2}" == "00" ] && [ "${partitiontable:104:2}" == "00" ]; then echo "Found System ID '00' for each remaining possible partition" partitiontable="GPT" echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT." + #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT." exit 1 else partitiontable="GPT/MBR" echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT/MBR." + #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT/MBR." exit 2 fi fi @@ -56,7 +58,7 @@ echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using MBR." + #"$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using MBR." exit 3 fi Index: branches/blackosx/package/Scripts/Install/CheckDiskMicrocode.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckDiskMicrocode.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/CheckDiskMicrocode.sh (revision 1563) @@ -41,7 +41,7 @@ if [ $( echo "${mbr437}" | awk -F0 '{print NF-1}' ) = 874 ]; then echo "The first 437 bytes of the MBR Disk Sector is blank - Updating" - "$scriptDir"InstallLog.sh "${targetVolume}" "First 437 bytes of the MBR are currently blank. Will update." + #"$scriptDir"InstallLog.sh "${targetVolume}" "Target has no bootcode in the MBR disk sector." else # There is already something on the MBR @@ -50,7 +50,7 @@ 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" - "$scriptDir"InstallLog.sh "${targetVolume}" "Found existing Windows boot loader - Will replace with boot0md" + "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Windows boot loader - Will replace with boot0md" fi # See if a Chameleon stage0 boot file already exists @@ -60,27 +60,26 @@ # need to be checked to see if they are the same or not. stage0type=$( dd 2>/dev/null if="$targetDisk" count=3 bs=1 skip=105 | xxd | awk '{print $2$3}' ) - #echo ${stage0type} if [ "${stage0type}" == "0b807c" ]; then - echo "Found existing Chameleon stage 0 loader - Boot0hfs" - "$scriptDir"InstallLog.sh "${targetVolume}" "Found existing Chameleon stage 0 loader - boot0hfs" + echo "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" - "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is not installed - Replace boot0hfs with boot0" + "$scriptDir"InstallLog.sh "${targetVolume}" "Will replace boot0hfs with boot0 as Windows is not on target disk." exit 0 fi fi if [ "${stage0type}" == "0a803c" ]; then echo "Found existing Chameleon stage 0 loader - Boot0" - "$scriptDir"InstallLog.sh "${targetVolume}" "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" - "$scriptDir"InstallLog.sh "${targetVolume}" "As Windows is installed - Replace boot0 with boot0md" + "$scriptDir"InstallLog.sh "${targetVolume}" "Will replace boot0 with boot0md as Windows is on target disk." exit 0 fi fi @@ -88,7 +87,7 @@ if [ "${stage0type}" == "ee7505" ]; then echo "Found existing Chameleon stage 0 loader - Boot0md" echo "And will leave boot0md installed." - "$scriptDir"InstallLog.sh "${targetVolume}" "Found existing Chameleon stage 0 loader - boot0md. Leaving as is." + "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0md. Leaving as is." exit 1 fi @@ -98,7 +97,7 @@ echo "Disk microcode found: ${test} - Preserving." echo "diskupdate is set to false" echo "-----------------------------------------------" - "$scriptDir"InstallLog.sh "${targetVolume}" "NOTE: Found existing unknown bootcode in the MBR. Leaving as is." + "$scriptDir"InstallLog.sh "${targetVolume}" "NOTE: Target has existing unrecognised bootcode in the MBR. Leaving as is." echo "" exit 1 fi Index: branches/blackosx/package/Scripts/Install/SetActivePartition.sh =================================================================== --- branches/blackosx/package/Scripts/Install/SetActivePartition.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/SetActivePartition.sh (revision 1563) @@ -32,22 +32,20 @@ exit 9 fi -partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') -"$scriptDir"InstallLog.sh "${targetVolume}" "Current active partition on ${targetDiskRaw#/dev/r}: ${partitionactive}" +# Append fdisk output to the installer log +"$scriptDir"InstallLog.sh "${targetVolume}" "fdisk ${targetDiskRaw}" if [ ${diskSigCheck} == "0" ]; then - #echo "DEBUG: Windows is not installed so let's change the active partition" - "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is not installed so let's change the active partition" + #Windows is not installed so let's change the active partition" - if [ "${partitionactive}" = "${targetSlice}" ]; then - #echo "${targetVolume} is already flagged as active" - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetVolume} is already flagged as active" + partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') + if [ "${partitionactive}" ] && [ "${partitionactive}" = "${targetSlice}" ]; then + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDiskRaw#/dev/r}, slice "${targetSlice}" is already set active. No need to change it." else - #echo "${targetVolume} is not flagged as active, so let's do it." - "$scriptDir"InstallLog.sh "${targetVolume}" "${targetVolume} is not flagged as active, so let's do it." + "$scriptDir"InstallLog.sh "${targetVolume}" "Setting ${targetVolume} partition active." # BadAxe requires EFI partition to be flagged active. # but it doesn't' hurt to do it for any non-windows partition. - + fdisk -e ${targetDiskRaw} <<-MAKEACTIVE print flag ${targetSlice} @@ -57,6 +55,9 @@ MAKEACTIVE fi else + # 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" "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is installed so that can remain the active partition" fi Index: branches/blackosx/package/Scripts/Install/CheckWindowsDiskSignature.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckWindowsDiskSignature.sh (revision 1562) +++ branches/blackosx/package/Scripts/Install/CheckWindowsDiskSignature.sh (revision 1563) @@ -31,7 +31,6 @@ echo "No Windows installation detected." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is not installed on this volume." exit 0 else echo "Detected an existing Windows installation" Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1562) +++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1563) @@ -215,14 +215,17 @@ More themes can be found at http://forum.voodooprojects.org/index.php/board,7.0.html"; "Embed_title" = "Embed"; -"Embed_description" = "A smaller simple version of the new default theme used when building a version of Chameleon which requires an embedded theme. "; +"Embed_description" = "A smaller simple version of the new default theme used when building a version of Chameleon which requires an embedded theme."; "Legacy_title" = "Legacy"; -"Legacy_description" = "Chameleon's previous default theme"; +"Legacy_description" = "Chameleon's original default theme introduced for v2.0 RC1"; "Default_title" = "Standard"; -"Default_description" = "Chameleon's new default theme."; +"Default_description" = "Chameleon default theme introduced for v2.0 RC5"; +"Bullet_title" = "Bullet"; +"Bullet_description" = "A lovely simple theme by NoSmokingBandit from April 2009."; + // Extras "Extras_title" = "Extras"; "Extras_description" = "A collection of useful addons";