Index: branches/blackosx/package/Scripts/Standard/postinstall =================================================================== --- branches/blackosx/package/Scripts/Standard/postinstall (revision 1561) +++ branches/blackosx/package/Scripts/Standard/postinstall (revision 1562) @@ -68,6 +68,9 @@ # 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}" "Running Standard postinstall script Target volume = ${targetVolume}" Index: branches/blackosx/package/Scripts/EFI/postinstall =================================================================== --- branches/blackosx/package/Scripts/EFI/postinstall (revision 1561) +++ branches/blackosx/package/Scripts/EFI/postinstall (revision 1562) @@ -71,6 +71,9 @@ # 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}" "Running EFI postinstall script Target volume selected by user = ${targetVolumeChosenByUser} Target volume = ${targetVolume}" Index: branches/blackosx/package/Scripts/Install/InstallLog.sh =================================================================== --- branches/blackosx/package/Scripts/Install/InstallLog.sh (revision 1561) +++ branches/blackosx/package/Scripts/Install/InstallLog.sh (revision 1562) @@ -36,14 +36,17 @@ # Chameleon_Installer_Log.txt file # by writing header. - echo "Chameleon installer log - "$( date ) >"${logFile}" - echo "------------------------------------------------------" >>"${logFile}" + # Also include the first message that this script + # would be called with which will be version/revision + # of Chameleon package. + + echo "Chameleon installer log - $( date ) +------------------------------------------------------ +${verboseText} +------------------------------------------------------" >"${logFile}" diskutil list >>"${logFile}" echo "------------------------------------------------------" >>"${logFile}" - # Write first message that this script was called with. - echo "${verboseText}" >> "${logFile}" - # Create /.ChameleonLogFlag file. echo "Log" >"${logLocation}"/.ChameleonLogFlag else Index: branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh (revision 1561) +++ branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh (revision 1562) @@ -69,7 +69,7 @@ #ĘCheck to see if the user wants to hide the boot file #if [ -f "${selectedDestination}"/.Chameleon/nullhideboot ]; then # echo "Executing command: SetFile -a V ${targetVolume}/${stage2Loader}" -# "${selectedDestination}"/.Chameleon//Tools/SetFile -a V "${targetVolume}"/"${stage2Loader}" +# "${selectedDestination}"/.Chameleon/Resources/SetFile -a V "${targetVolume}"/"${stage2Loader}" #fi echo "-----------------------------------------------" Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1561) +++ branches/blackosx/package/buildpkg.sh (revision 1562) @@ -82,22 +82,24 @@ # build standard package mkdir -p ${1}/Standard/Root - mkdir -p ${1}/Standard/Scripts/Tools + mkdir -p ${1}/Standard/Scripts/Resources cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts cp -f ${pkgroot}/Scripts/Install/* ${1}/Standard/Scripts - ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile - ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools + ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Resources/SetFile + ditto --noextattr --noqtn ${1%/*/*}/revision ${1}/Standard/Scripts/Resources/revision + ditto --noextattr --noqtn ${1%/*/*}/version ${1}/Standard/Scripts/Resources/version echo " [BUILD] Standard " buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1 # End build standard package # build efi package mkdir -p ${1}/EFI/Root - mkdir -p ${1}/EFI/Scripts/Tools + mkdir -p ${1}/EFI/Scripts/Resources cp -f ${pkgroot}/Scripts/EFI/* ${1}/EFI/Scripts cp -f ${pkgroot}/Scripts/Install/* ${1}/EFI/Scripts - ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile - ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools + 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 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