bug fix for the --auto flag

grahampugh · Dec 10, 2020 · 30cf802 · 30cf802
1 parent 2d19cf8
commit 30cf802
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 No date
 
+## [0.16.1]
+
+10.12.2020
+
+- Bug fix: `--auto` was being incorrectly assigned when using `--os`, `--build` etc.
+
 ## [0.16.0]
 
 10.12.2020

diff --git a/erase-install.sh b/erase-install.sh
@@ -506,12 +506,19 @@ run_installinstallmacos() {
         if [[ $skip_validation != "yes" ]]; then
             [[ $erase == "yes" || $reinstall == "yes" ]] && installinstallmacos_args+="--validate "
         fi
+    fi
 
-    elif [[ ! $list  == "yes" ]]; then
+    if [[ $list != "yes" && ! $prechosen_os && ! $prechosen_version && ! $prechosen_build && ! $samebuild ]]; then
         echo "   [run_installinstallmacos] Getting current production version"
         installinstallmacos_args+="--auto "
     fi
 
+    # TEST 
+    echo
+    echo "   [run_installinstallmacos] This command is now being run:"
+    echo
+    echo "   installinstallmacos.py $installinstallmacos_args"
+
     if ! python "$workdir/installinstallmacos.py" $installinstallmacos_args ; then
         echo "   [run_installinstallmacos] Error obtaining valid installer. Cannot continue."
         kill_process jamfHelper

diff --git a/pkg/erase-install/build-info.plist b/pkg/erase-install/build-info.plist
@@ -17,6 +17,6 @@
 	<key>suppress_bundle_relocation</key>
 	<true/>
 	<key>version</key>
-	<string>0.16.0</string>
+	<string>0.16.1</string>
 </dict>
 </plist>