Index: branches/blackosx/package/Distribution
===================================================================
--- branches/blackosx/package/Distribution	(revision 1773)
+++ branches/blackosx/package/Distribution	(revision 1774)
@@ -15,6 +15,16 @@
 
     <script>
 
+    var bootPlist = null;
+    if (my.target) {
+        var boot_plist_filenames = new Array( 'org.chameleon.Boot.plist', 'com.apple.Boot.plist' );
+        for ( var i = 0; i &lt; boot_plist_filenames.length; i++ ) {
+            bootPlist = system.files.plistAtPath( my.target.mountpoint + '/Extra/' + boot_plist_filenames[i] );
+            if (bootPlist)
+                break;
+        }
+    }
+
     function installCheckScript() {
         var obj = system.ioregistry.matchingClass("AppleSMC");
         if (obj) {
@@ -39,22 +49,8 @@
         return false;
     }
 
-    function get_chameleon_boot_plist() {
-        if (my.target) {
-            var boot_plist_filenames = new Array( 'org.chameleon.Boot.plist', 'com.apple.Boot.plist' );
-            for ( var i = 0; i &lt; boot_plist_filenames.length; i++ ) {
-                var plist = system.files.plistAtPath( my.target.mountpoint + '/Extra/' + boot_plist_filenames[i] );
-                if (plist)
-                   return plist;
-            }
-        }
-        return null;
-    }
-
     function chameleon_boot_plist_exists() {
-        if (get_chameleon_boot_plist() != null)
-            return true;
-        return false;
+        return bootPlist ? true : false;
     }
 
     function check_chameleon_kernel_option(kernelFlags, value) {
@@ -67,25 +63,17 @@
     }
 
     function check_chameleon_option(key, value) {
-        var bootPlist = get_chameleon_boot_plist();
-        if (bootPlist) {
-            if (key == "KFflag")
-                key = "Kernel Flags";
+        if ( bootPlist &amp;&amp; bootPlist[ key ] ) {
+            if ( key == "Kernel Flags" )
+                return check_chameleon_kernel_option( bootPlist[ key ], value );
 
-            if (bootPlist[ key ]) {
-                if ( key == "Kernel Flags" )
-                    return check_chameleon_kernel_option( bootPlist[ key ], value );
-
-                // Check if value is a boolean
-                var pattern=/^(Y(es)?|No?)$/i;
-                var result = value.match(pattern); // Check if the value is a boolean
-                if ( result &amp;&amp; bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase() )
-                    return true;
-                else
-                    return bootPlist[ key ] == value; // check if the strings are equal
-            }
+            // Check if value is a boolean
+            var pattern=/^(Y(es)?|No?)$/i;
+            var result = value.match(pattern); // Check if the value is a boolean
+            if ( result &amp;&amp; bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase() )
+                return true;
             else
-                return false;
+                return bootPlist[ key ] == value; // check if the strings are equal
         }
         return false;
     }
Index: branches/blackosx/package/OptionalSettings/Resolution.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/Resolution.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/Resolution.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/blackosx/package/OptionalSettings/Video.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/Video.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/Video.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/blackosx/package/OptionalSettings/PowerManagement.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/PowerManagement.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/PowerManagement.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/blackosx/package/OptionalSettings/General.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/General.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/General.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/blackosx/package/OptionalSettings/KernelFlags.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/KernelFlags.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/KernelFlags.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
@@ -25,8 +25,8 @@
 # ---------------------------------------------
 # Note: There must be a carriage return at end of last line
 # ---------------------------------------------
-Verbose:KFflag=-v
-Singleusermode:KFflag=-s
-Ignorecaches:KFflag=-f
-Npci:KFflag=npci=0x2000
-Darkwake:KFflag=darkwake=0
+Verbose:Kernel Flags=-v
+Singleusermode:Kernel Flags=-s
+Ignorecaches:Kernel Flags=-f
+Npci:Kernel Flags=npci=0x2000
+Darkwake:Kernel Flags=darkwake=0
Index: branches/blackosx/package/OptionalSettings/Control.txt
===================================================================
--- branches/blackosx/package/OptionalSettings/Control.txt	(revision 1773)
+++ branches/blackosx/package/OptionalSettings/Control.txt	(revision 1774)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/blackosx/package/Scripts/Main/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Main/postinstall	(revision 1773)
+++ branches/blackosx/package/Scripts/Main/postinstall	(revision 1774)
@@ -78,47 +78,34 @@
     cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP"
 
     # Read list of all boot options the user added.
-    arrayCount=0
-    kernelFlagCount=0
-    while read FILE
-    do
-        options[arrayCount]="${FILE##*/}"
+    while IFS= read -r -d '' FILE; do
+        option="${FILE##*/}"
+        key="${option%%=*}"
+        value="${option#*=}"
 
-        # Check keyRead for 'KF' at beginning to
-        # indicate that should be a kernel flag
-        if [ ${options[arrayCount]:0:2} = "KF" ];then
+        # Check for 'Kernel Flags' key indicate that should be a kernel flag
+        if [[ "$key" = "Kernel Flags" ]];then
             # plistbuddy only add's if the key doesn't already exist.
             # So let's store any kernelflags and add them all at the
             # same time once when we reach the end of the options list.
-            kernelflag[kernelFlagCount]="${options[arrayCount]##*flag=}"
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: ${kernelflag[kernelFlagCount]}"
-            (( kernelFlagCount++ ))
+            kernelflag[${#kernelflag[*]}]="$value"
+            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value"
         else
-            keyRead="${options[$arrayCount]%=*}"
-            value="${options[$arrayCount]#*=}"
             # escape any spaces
-            keyToUse=$( echo $keyRead | sed 's/ /\\ /g' )
-            if [ "${keyToUse}" != "DONT" ] && [ "${value}" != "ADD" ]; then
-                sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
-                returnValue=$?
-                if [ ${returnValue} -ne 1 ]; then
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${keyRead}=${value}"
-                else
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${keyRead}=${value} as an option already exists for: ${keyRead}"
-                fi
+            keyToUse=$( echo "$key" | sed 's/ /\\ /g' )
+            sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
+            returnValue=$?
+            if [ ${returnValue} -ne 1 ]; then
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}"
+            else
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}"
             fi
         fi
-        (( arrayCount++ ))
-    done < <(ls "${chamTemp}"/options )
+    done < <( find "${chamTemp}/options" -type f -print0 )
 
-    if [ $kernelFlagCount -gt 0 ]; then
-        # Add any kernel flags together in to one string.
-        for (( i=0 ; i < $kernelFlagCount ; i++ ))
-        do
-            kernelFlagString="${kernelFlagString} ${kernelflag[i]}"
-        done
-        # We add the final string in the next section.
-    fi
+    # Add any kernel flags together in to one string.
+    kernelFlagString="${kernelflag[@]}"
+    # We add the final string in the next section.
 fi
 
 # ---------------------------------------------
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh	(revision 1773)
+++ branches/blackosx/package/buildpkg.sh	(revision 1774)
@@ -519,7 +519,7 @@
             textLine=${availableOptions[c]}
             # split line - taking all before ':' as option name
             # and all after ':' as key/value
-            optionName=${textLine%:*}
+            optionName=${textLine%%:*}
             keyValue=${textLine##*:}
             key=${keyValue%%=*}
             value=${keyValue#*=}

Property changes on: branches/blackosx
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r1771-1773