Index: branches/iFabio/trunk/package/buildpkg =================================================================== --- branches/iFabio/trunk/package/buildpkg (revision 186) +++ branches/iFabio/trunk/package/buildpkg (revision 187) @@ -43,6 +43,7 @@ # build core package mkdir -p ${1}/Core/Root/usr/sbin + mkdir -p ${1}/Core/Root/usr/local/bin mkdir -p ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386 @@ -54,8 +55,8 @@ cp -f ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386 fixperms "${1}/Core/Root/" + cp -f ${pkgroot}/fdisk ${1}/Core/Root/usr/sbin cp -f ${pkgroot}/fdisk440 ${1}/Core/Root/usr/sbin - cp -f ${1%/*}/i386/bdmesg ${1}/Core/Root/usr/sbin local coresize=$( du -hkc "${1}/Core/Root" | tail -n1 | awk {'print $1'} ) echo "Building core package" buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" @@ -63,8 +64,8 @@ # build standard package mkdir -p ${1}/Standard/Root - mkdir -p ${1}/Standard/Scripts - cp -f ${pkgroot}/Scripts/Standard/postinstall ${1}/Standard/Scripts + mkdir -p ${1}/Standard/Scripts/Tools + cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile echo "Building boot0 package" buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EnhancedHFS']) && exclusive(choices['Standardhfs']) && exclusive(choices['EnhancedFAT']) && exclusive(choices['noboot'])\"" @@ -73,7 +74,7 @@ # build standard package with boot0hfs mkdir -p ${1}/Standardhfs/Root mkdir -p ${1}/Standardhfs/Scripts - cp -f ${pkgroot}/Scripts/Standardhfs/postinstall ${1}/Standardhfs/Scripts + cp -f ${pkgroot}/Scripts/Standardhfs/* ${1}/Standardhfs/Scripts ditto --arch i386 `which SetFile` ${1}/Standardhfs/Scripts/Tools/SetFile echo "Building boot0hfs package" buildpackage "${1}/Standardhfs" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"false\" selected=\"exclusive(choices['EnhancedHFS']) && exclusive(choices['Standard']) && exclusive(choices['EnhancedFAT']) && exclusive(choices['noboot'])\"" @@ -112,10 +113,9 @@ ((xmlindent++)) packagesidentity="org.chameleon.theme" artwork="${1%/*}" - artwork="${1%/*}" - themes=($( find "${artwork%/*}/artwork/themes" -type d -depth 1 -not -name '.svn' )) - for (( i = 0 ; i < ${#themes[@]} ; i++ )) - do + themes=($( find "${artwork%/*}/artwork/themes" -type d -depth 1 -not -name '.svn' )) + for (( i = 0 ; i < ${#themes[@]} ; i++ )) + do theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' ) mkdir -p "${1}/${theme}/Root/" ditto --noextattr --noqtn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}" @@ -399,3 +399,4 @@ } main "${1}" "${2}" "${3}" "${4}" "${5}" + Index: branches/iFabio/trunk/package/Scripts/HFS/postinstall =================================================================== --- branches/iFabio/trunk/package/Scripts/HFS/postinstall (revision 186) +++ branches/iFabio/trunk/package/Scripts/HFS/postinstall (revision 187) @@ -154,7 +154,7 @@ checkpartitionactive () { -partitionactive=$( fdisk440 -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') +partitionactive=$( fdisk -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') if [ -n "${partitionactive}" ]; then echo "Partition flagged active is ${partitionactive}" @@ -186,8 +186,8 @@ checkpartitionactive if ${diskupdate}; then - echo "Executing command: fdisk440 -u -f ${diskloader} -y ${bootdisk}" - fdisk440 -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} + echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}" + fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} fi echo "Executing command: dd if=${partitionloader} of=${bootrdev}" @@ -196,7 +196,7 @@ # If table is GPT make the first partition active (BadAxe compatibility). [ "${partitiontable}" = "GPT" ] && bootslice=1 if [[ "${partitiontable}" = "GPT" ]]; then - fdisk440 -e ${bootdisk} <<-MAKEACTIVE + fdisk -e ${bootdisk} <<-MAKEACTIVE print flag ${bootslice} write @@ -217,36 +217,36 @@ echo "Executing command: cp ${osxvolume}${filesystemloader} ${bootvolume}/boot" cp "${osxvolume}${filesystemloader}" "${bootvolume}/boot" -#if ! [ -d "${bootvolume}/Extra/Extensions" ]; then -# echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" -# mkdir -p "${bootvolume}/Extra/Extensions" -#fi +if ! [ -d "${bootvolume}/Extra/Extensions" ]; then + echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" + mkdir -p "${bootvolume}/Extra/Extensions" +fi # unpack any existing Extensions.mkext already on the booter volume -#if [ -e "${bootvolume}/Extra/Extensions.mkext" ]; then -# echo "Executing command: mkextunpack -d ${bootvolume}/Extra/Extensions ${bootvolume}/Extra/Extensions.mkext" -# mkextunpack -d "${bootvolume}/Extra/Extensions" "${bootvolume}/Extra/Extensions.mkext" -# echo "Executing command: rm -R -f ${bootvolume}/Extra/Extensions.mkext" -# rm -R -f "${bootvolume}/Extra/Extensions.mkext" -#fi +if [ -e "${bootvolume}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${bootvolume}/Extra/Extensions ${bootvolume}/Extra/Extensions.mkext" + mkextunpack -d "${bootvolume}/Extra/Extensions" "${bootvolume}/Extra/Extensions.mkext" + echo "Executing command: rm -R -f ${bootvolume}/Extra/Extensions.mkext" + rm -R -f "${bootvolume}/Extra/Extensions.mkext" +fi # copy existing /Extra -#if [ -d "${2}/Extra" ]; then -# [ -d "${bootvolume}/Extra/Extensions" ] || mkdir -p "${bootvolume}/Extra/Extensions" -# echo "Executing command: find ${2}/Extra -name '*.plist' -depth 1 -exec cp -f {} ${bootvolume}/Extra \;" -# find "${2}/Extra" -name '*.plist' -depth 1 -exec cp -f {} "${bootvolume}/Extra/" \; -# if [ -f "${2}/Extra/Extensions.mkext" ]; then -# echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" -# mkextunpack -d "${bootvolume}/Extra/Extensions" "${2}/Extra/Extensions.mkext" -# fi -# if [ -d "${2}/Extra/Extensions" ]; then -# echo "Executing command: find ${2}/Extra/Extensions -name '*.kext' -depth 1 -exec cp -R {} ${bootvolume}/Extra/Extensions \;" -# find "${2}/Extra/Extensions" -name '*.kext' -depth 1 -exec cp -R {} "${bootvolume}/Extra/Extensions" \; -# fi -#fi +if [ -d "${2}/Extra" ]; then + [ -d "${bootvolume}/Extra/Extensions" ] || mkdir -p "${bootvolume}/Extra/Extensions" + echo "Executing command: find ${2}/Extra -name '*.plist' -depth 1 -exec cp -f {} ${bootvolume}/Extra \;" + find "${2}/Extra" -name '*.plist' -depth 1 -exec cp -f {} "${bootvolume}/Extra/" \; + if [ -f "${2}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" + mkextunpack -d "${bootvolume}/Extra/Extensions" "${2}/Extra/Extensions.mkext" + fi + if [ -d "${2}/Extra/Extensions" ]; then + echo "Executing command: find ${2}/Extra/Extensions -name '*.kext' -depth 1 -exec cp -R {} ${bootvolume}/Extra/Extensions \;" + find "${2}/Extra/Extensions" -name '*.kext' -depth 1 -exec cp -R {} "${bootvolume}/Extra/Extensions" \; + fi +fi # setup link for extras -#[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" -#echo "Executing command: ln -s /Volumes/${bootervolumename} ${2}/.Chameleon" -#ln -s "/Volumes/${bootervolumename}" "${2}/.Chameleon" +[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" +echo "Executing command: ln -s /Volumes/${bootervolumename} ${2}/.Chameleon" +ln -s "/Volumes/${bootervolumename}" "${2}/.Chameleon" exit Index: branches/iFabio/trunk/package/Scripts/Standard/postinstall =================================================================== --- branches/iFabio/trunk/package/Scripts/Standard/postinstall (revision 186) +++ branches/iFabio/trunk/package/Scripts/Standard/postinstall (revision 187) @@ -13,9 +13,7 @@ # 1 volume bootvolume="${@}" -echo "Volume is $bootvolume" bootresources="${0%/*}" -echo "$bootresources" if [ -z "${bootvolume}" ]; then echo @@ -132,7 +130,7 @@ checkpartitionactive () { -partitionactive=$( fdisk440 -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') +partitionactive=$( fdisk -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') if [ -n "${partitionactive}" ]; then echo "Partition flagged active is ${partitionactive}" @@ -188,8 +186,8 @@ "${bootresources}/Tools/SetFile" -a V "${bootvolume}/${filesystemloader}" # If table is GPT make the first partition active (BadAxe compatibility). -#[ "${partitiontable}" = "GPT" ] && bootslice=1 -fdisk440 -e ${bootdisk} <<-MAKEACTIVE +[ "${partitiontable}" = "GPT" ] && bootslice=1 +fdisk -e ${bootdisk} <<-MAKEACTIVE print flag ${bootslice} write @@ -202,29 +200,21 @@ checkpartitionbootcode check checkpartitionactive -# Check efi partition -if [ -d /Volumes/EFI ]; then - umount -f /Volumes/EFI - rm -R -f /Volumes/EFI +if ! [ -d "${bootvolume}/Extra/Extensions" ]; then + echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" + mkdir -p "${bootvolume}/Extra/Extensions" fi - -if [ -d "${bootvolume}/Extra/Extensions" ]; then -# echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" - mkdir -p "${bootvolume}/ExtraBackup" - cp -f -R "${bootvolume}/Extra" "${bootvolume}/ExtraBackup" - rm -f -R "${bootvolume}/Extra" -fi # unpack any existing Extensions.mkext already on the booter volume -if [ -f "${2}/ExtraBackup/Extensions.mkext" ]; then - 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" +if [ -f "${2}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" + mkextunpack -d "${2}/Extra/Extensions" "${2}/Extra/Extensions.mkext" + echo "Executing command: rm -R -f ${2}/Extra/Extensions.mkext" + rm -R -f "${2}/Extra/Extensions.mkext" fi # setup link for extras -#[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" -#echo "Executing command: ln -s . ${2}/.Chameleon" -#ln -s "${2}" "${2}/.Chameleon" +[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" +echo "Executing command: ln -s . ${2}/.Chameleon" +ln -s "." "${2}/.Chameleon" exit Index: branches/iFabio/trunk/package/Scripts/Standardhfs/postinstall =================================================================== --- branches/iFabio/trunk/package/Scripts/Standardhfs/postinstall (revision 186) +++ branches/iFabio/trunk/package/Scripts/Standardhfs/postinstall (revision 187) @@ -13,9 +13,7 @@ # 1 volume bootvolume="${@}" -echo "Volume is $bootvolume" bootresources="${0%/*}" -echo "$bootresources" if [ -z "${bootvolume}" ]; then echo @@ -174,8 +172,8 @@ checkpartitionactive if ${diskupdate}; then - echo "Executing command: fdisk -u -f /usr/standalone/i386/${diskloader} -y ${bootdisk}" - fdisk -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk} + echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${diskloader} -y ${bootdisk}" + fdisk440 -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk} fi echo "Executing command: dd if=/usr/standalone/i386/${partitionloader} of=${bootrdev}" @@ -202,29 +200,21 @@ checkpartitionbootcode check checkpartitionactive -# Check efi partition -if [ -d /Volumes/EFI ]; then - umount -f /Volumes/EFI - rm -R -f /Volumes/EFI -fi - if ! [ -d "${bootvolume}/Extra/Extensions" ]; then -# 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 "Executing command: mkdir -p ${bootvolume}/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 "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" +if [ -f "${2}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" + mkextunpack -d "${2}/Extra/Extensions" "${2}/Extra/Extensions.mkext" + echo "Executing command: rm -R -f ${2}/Extra/Extensions.mkext" + rm -R -f "${2}/Extra/Extensions.mkext" fi # setup link for extras -#[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" -#echo "Executing command: ln -s . ${2}/.Chameleon" -#ln -s "${2}" "${2}/.Chameleon" +[ -h "${2}/.Chameleon" ] && unlink "${2}/.Chameleon" +echo "Executing command: ln -s . ${2}/.Chameleon" +ln -s "." "${2}/.Chameleon" exit Index: branches/iFabio/trunk/package/Scripts/FAT/postinstall =================================================================== --- branches/iFabio/trunk/package/Scripts/FAT/postinstall (revision 186) +++ branches/iFabio/trunk/package/Scripts/FAT/postinstall (revision 187) @@ -149,7 +149,7 @@ checkpartitionactive () { -partitionactive=$( fdisk440 -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') +partitionactive=$( fdisk -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}') if [ -n "${partitionactive}" ]; then echo "Partition flagged active is ${partitionactive}" @@ -186,8 +186,8 @@ checkpartitionactive if ${diskupdate}; then - echo "Executing command: fdisk440 -u -f ${diskloader} -y ${bootdisk}" - fdisk440 -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} + echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}" + fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} fi #echo "Executing command: dd if=${partitionloader} of=${bootrdev}" @@ -210,7 +210,7 @@ # If table is MBR make the correct slice active. If table is GPT make the first partition active (BadAxe compatibility). [ "${partitiontable}" = "GUID_partition_scheme" ] && bootslice=1 if [[ "${partitiontable}" = "FDisk_partition_scheme" || "${partitiontable}" = "GUID_partition_scheme" ]]; then - fdisk440 -e ${bootdisk} <<-MAKEACTIVE + fdisk -e ${bootdisk} <<-MAKEACTIVE print flag ${bootslice} write @@ -225,43 +225,41 @@ checkpartitionactive [ -d "${bootvolume}" ] || mkdir -p "${bootvolume}" -echo "Executing command: mount_msdos -u 0 -g 0 ${bootdev} ${bootvolume}" +echo "Executing command: mount_hfs ${bootdev} ${bootvolume}" mount_msdos -u 0 -g 0 "${bootdev}" "${bootvolume}" echo "Executing command: cp ${osxvolume}${filesystemloader} ${bootvolume}/boot" cp "${osxvolume}${filesystemloader}" "${bootvolume}/boot" -#cp -R "${osxvolume}/Extra" "${bootvolume}/Extra" -#if ! [ -d "${bootvolume}/Extra/Extensions" ]; then -# echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" -# mkdir -p "${bootvolume}/Extra/Extensions" -#fi +if ! [ -d "${bootvolume}/Extra/Extensions" ]; then + echo "Executing command: mkdir -p ${bootvolume}/Extra/Extensions" + mkdir -p "${bootvolume}/Extra/Extensions" +fi # unpack any existing Extensions.mkext already on the booter volume -#if [ -e "${bootvolume}/Extra/Extensions.mkext" ]; then -# echo "Executing command: mkextunpack -d ${bootvolume}/Extra/Extensions ${bootvolume}/Extra/Extensions.mkext" -# mkextunpack -d "${bootvolume}/Extra/Extensions" "${bootvolume}/Extra/Extensions.mkext" -# echo "Executing command: rm -R -f ${bootvolume}/Extra/Extensions.mkext" -# rm -R -f "${bootvolume}/Extra/Extensions.mkext" -#fi +if [ -e "${bootvolume}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${bootvolume}/Extra/Extensions ${bootvolume}/Extra/Extensions.mkext" + mkextunpack -d "${bootvolume}/Extra/Extensions" "${bootvolume}/Extra/Extensions.mkext" + echo "Executing command: rm -R -f ${bootvolume}/Extra/Extensions.mkext" + rm -R -f "${bootvolume}/Extra/Extensions.mkext" +fi # copy existing /Extra -#if [ -d "${2}/Extra" ]; then -# [ -d "${bootvolume}/Extra/Extensions" ] || mkdir -p "${bootvolume}/Extra/Extensions" -# echo "Executing command: find ${2}/Extra -name '*.plist' -depth 1 -exec cp -f {} ${bootvolume}/Extra \;" -# find "${2}/Extra" -name '*.plist' -depth 1 -exec cp -f {} "${bootvolume}/Extra/" \; -# if [ -f "${2}/Extra/Extensions.mkext" ]; then -# echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" -# mkextunpack -d "${bootvolume}/Extra/Extensions" "${2}/Extra/Extensions.mkext" -# fi -# if [ -d "${2}/Extra/Extensions" ]; then -# echo "Executing command: find ${2}/Extra/Extensions -name '*.kext' -depth 1 -exec cp -R {} ${bootvolume}/Extra/Extensions \;" -# find "${2}/Extra/Extensions" -name '*.kext' -depth 1 -exec cp -R {} "${bootvolume}/Extra/Extensions" \; -# fi -#fi +if [ -d "${2}/Extra" ]; then + [ -d "${bootvolume}/Extra/Extensions" ] || mkdir -p "${bootvolume}/Extra/Extensions" + echo "Executing command: find ${2}/Extra -name '*.plist' -depth 1 -exec cp -f {} ${bootvolume}/Extra \;" + find "${2}/Extra" -name '*.plist' -depth 1 -exec cp -f {} "${bootvolume}/Extra/" \; + if [ -f "${2}/Extra/Extensions.mkext" ]; then + echo "Executing command: mkextunpack -d ${2}/Extra/Extensions ${2}/Extra/Extensions.mkext" + mkextunpack -d "${bootvolume}/Extra/Extensions" "${2}/Extra/Extensions.mkext" + fi + if [ -d "${2}/Extra/Extensions" ]; then + echo "Executing command: find ${2}/Extra/Extensions -name '*.kext' -depth 1 -exec cp -R {} ${bootvolume}/Extra/Extensions \;" + find "${2}/Extra/Extensions" -name '*.kext' -depth 1 -exec cp -R {} "${bootvolume}/Extra/Extensions" \; + fi +fi # setup link for extras -#echo "Executing command: ln -s /Volumes/${bootervolumename} ${2}/.Chameleon" -#ln -s "/Volumes/${bootervolumename}" "${2}/.Chameleon" -# setup link for extras +echo "Executing command: ln -s /Volumes/${bootervolumename} ${2}/.Chameleon" +ln -s "/Volumes/${bootervolumename}" "${2}/.Chameleon" exit Index: branches/iFabio/trunk/revision =================================================================== --- branches/iFabio/trunk/revision (revision 186) +++ branches/iFabio/trunk/revision (revision 187) @@ -1 +1 @@ -184:185 \ No newline at end of file +184:186 \ No newline at end of file