Index: branches/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.pkg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.1b.pkg =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/trunk/PackageBuilder/Build/Chameleon Installer v2.1.1b.pkg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh (revision 246) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/WriteChameleonStage2.sh (revision 247) @@ -26,7 +26,7 @@ # if chosen, the package installer will add a file named 'nullESP' # in to the temporary directory /.Chameleon -if [ -f ${selectedDestination}/.Chameleon/nullESP ]; then +if [ -f "${selectedDestination}"/.Chameleon/nullESP ]; then echo "DEBUG: nullESP exists" @@ -54,7 +54,7 @@ fi echo "Executing command: cp ${selectedDestination}/.Chameleon/i386/${stage2Loader} ${targetVolume}" -cp "${selectedDestination}/.Chameleon/i386/${stage2Loader}" "${targetVolume}" +cp "${selectedDestination}"/.Chameleon/i386/"${stage2Loader}" "${targetVolume}" #echo "Executing command: ${targetResources}/Tools/SetFile -a V ${targetVolume}/${stage2Loader}" #"${targetResources}/Tools/SetFile" -a V "${targetVolume}/${stage2Loader}" Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/SetActivePartition.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/SetActivePartition.sh (revision 246) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/SetActivePartition.sh (revision 247) @@ -27,7 +27,7 @@ if [ ${diskSigCheck} == "0" ]; then echo "DEBUG: Windows is not installed so let's change the active partition" - partitionactive=$( ${targetVolume}/.Chameleon/i386/fdisk440 -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') + partitionactive=$( "${targetVolume}"/.Chameleon/i386/fdisk440 -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') echo "Current Active Partition: ${partitionactive}" if [ "${partitionactive}" = "${targetSlice}" ]; then @@ -37,7 +37,7 @@ # BadAxe requires EFI partition to be flagged active. # but it doesn't' hurt to do it for any non-windows partition. - ${targetVolume}/.Chameleon/i386/fdisk440 -e ${targetDiskRaw} <<-MAKEACTIVE + "${targetVolume}"/.Chameleon/i386/fdisk440 -e ${targetDiskRaw} <<-MAKEACTIVE print flag ${targetSlice} write Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 246) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh (revision 247) @@ -23,7 +23,7 @@ # or merge temporary Extra folder in to an already existing Extra # folder on the destination target. -if [ -d ${3}/.Chameleon/Extra ]; then +if [ -d "${3}"/.Chameleon/Extra ]; then # Check to see if install to EFI system partition was selected # if chosen, the package installer would have added a file named @@ -60,7 +60,7 @@ # remove the temporary /.Chameleon directory echo "Executing command: rm -r ${3}/.Chameleon/" -rm -r ${3}/.Chameleon/ +rm -r "${3}"/.Chameleon/ # remove the temporary boot sector files if they exist if [ -d /tmp/newbs ]; then Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh (revision 246) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/BuildBootOptions.sh (revision 247) @@ -2,7 +2,7 @@ main () { - tempDir="${destainationDrive}/.Chameleon/" + tempDir="${destinationDrive}/.Chameleon/" echo "DEBUG: tempDir is ${tempDir}" @@ -207,8 +207,8 @@ # get the passed destination drive? if [ "$#" -eq 1 ]; then - destainationDrive="$1" - echo "DEBUG: passed argument for destainationDrive = $destainationDrive" + destinationDrive="$1" + echo "DEBUG: passed argument for destinationDrive = $destinationDrive" fi # Build Boot Options Index: branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf (revision 246) +++ branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Resources/English.lproj/Welcome.rtfd/TXT.rtf (revision 247) @@ -5,7 +5,7 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural \f0\b\fs36 \cf2 Unofficial Chameleon Test installer -\fs22 \cf0 v2.1b\ +\fs22 \cf0 v2.1.1b\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural \b0 \cf3 by blackosx - 28th November 2010