Index: branches/blackosx/trunk/package/Scripts/HFS/postinstall =================================================================== --- branches/blackosx/trunk/package/Scripts/HFS/postinstall (revision 197) +++ branches/blackosx/trunk/package/Scripts/HFS/postinstall (revision 198) @@ -13,7 +13,7 @@ start () { -# 1 volume +# $1 volume osxvolume="${@}" bootresources="${0%/*}" @@ -372,42 +372,29 @@ -#checkdiskmicrocode check - why check as it would have changed after writing boot0? -#checkdisksignature - This should still be the same, but if it's changed then it's too late - unless we backed it up? -#checkpartitionbootcode check - why check as it would have changed after writing boot0? - echo "===============================================" echo "Check EFI Partition:" echo "***************************" -echo "Skipping for now" -# Check efi partition -#if [ -d /Volumes/EFI ]; then -# umount -f /Volumes/EFI -# rm -R -f /Volumes/EFI -#fi +if [ -d /Volumes/EFI ]; then + umount -f /Volumes/EFI + rm -R -f /Volumes/EFI +fi echo "-----------------------------------------------" echo "" echo "" +echo "===============================================" +echo "/Extra/Extensions Folder" +echo "*****************************************************" if [ -d "${bootvolume}/Extra/Extensions" ]; then -echo "-----------------------------------------------" -echo "Duplicating Extra to ExtraBackup Folder, then removing Extra" -echo "-----------------------------------------------" - echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" -# mkdir -p "${bootvolume}/ExtraBackup" -# cp -f -R "${bootvolume}/Extra" "${bootvolume}/ExtraBackup" -# rm -f -R "${bootvolume}/Extra" + echo "Duplicating Extra to ExtraBackup Folder" + mkdir -p "${bootvolume}/ExtraBackup" + cp -f -R "${bootvolume}/Extra" "${bootvolume}/ExtraBackup" +else + echo "Create /Extra/Extensions" + mkdir -p "${bootvolume}/Extra/Extensions" fi -# unpack any existing Extensions.mkext already on the booter volume -if [ -f "${2}/ExtraBackup/Extensions.mkext" ]; then -echo "-----------------------------------------------" -echo "Mkext section" -echo "-----------------------------------------------" - echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/ExtraBackup/Extensions.mkext" -# mkextunpack -d "${2}/.Chameleon/Extra/Extensions" "${2}/.Chameleon/ExtraBackup/Extensions.mkext" - echo "Executing command: rm -R -f ${2}/ExtraBackup/Extensions.mkext" -# rm -R -f "${2}/ExtraBackup/Extensions.mkext" -fi + # setup link for extras #[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" Index: branches/blackosx/trunk/package/Scripts/Standard/postinstall =================================================================== --- branches/blackosx/trunk/package/Scripts/Standard/postinstall (revision 197) +++ branches/blackosx/trunk/package/Scripts/Standard/postinstall (revision 198) @@ -11,7 +11,7 @@ start () { -# 1 volume +# $1 volume bootvolume="${@}" echo "Volume is $bootvolume" @@ -332,43 +332,18 @@ echo "" - -#checkdiskmicrocode check - why check as it would have changed after writing boot0? -#checkdisksignature - This should still be the same, but if it's changed then it's too late - unless we backed it up? -#checkpartitionbootcode check - why check as it would have changed after writing boot0? - echo "===============================================" -echo "Check EFI Partition:" -echo "***************************" -echo "Skipping for now" -# Check efi partition -#if [ -d /Volumes/EFI ]; then -# umount -f /Volumes/EFI -# rm -R -f /Volumes/EFI -#fi -echo "-----------------------------------------------" -echo "" -echo "" - +echo "/Extra/Extensions Folder" +echo "*****************************************************" if [ -d "${bootvolume}/Extra/Extensions" ]; then -echo "-----------------------------------------------" -echo "Duplicating Extra to ExtraBackup Folder, then removing Extra" -echo "-----------------------------------------------" - echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" -# mkdir -p "${bootvolume}/ExtraBackup" -# cp -f -R "${bootvolume}/Extra" "${bootvolume}/ExtraBackup" -# rm -f -R "${bootvolume}/Extra" + echo "Duplicating Extra to ExtraBackup Folder" + mkdir -p "${bootvolume}/ExtraBackup" + cp -f -R "${bootvolume}/Extra" "${bootvolume}/ExtraBackup" +else + echo "Create /Extra/Extensions" + mkdir -p "${bootvolume}/Extra/Extensions" fi -# unpack any existing Extensions.mkext already on the booter volume -if [ -f "${2}/ExtraBackup/Extensions.mkext" ]; then -echo "-----------------------------------------------" -echo "Mkext section" -echo "-----------------------------------------------" - echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/ExtraBackup/Extensions.mkext" -# mkextunpack -d "${2}/.Chameleon/Extra/Extensions" "${2}/.Chameleon/ExtraBackup/Extensions.mkext" - echo "Executing command: rm -R -f ${2}/ExtraBackup/Extensions.mkext" -# rm -R -f "${2}/ExtraBackup/Extensions.mkext" -fi + # setup link for extras #[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon"