From 501657ead1a76899aba0e22dc3a7ce451aaa33eb Mon Sep 17 00:00:00 2001 From: Mario Panighetti Date: Wed, 10 Apr 2019 17:28:30 -0700 Subject: [PATCH 1/2] added --no-scan flag to download and install commands - added `--no-scan` flag to `--download` and `--install` commands (avoids repeatedly checking for updates after initial `softwareupdate --list, speeding up script runtime) --- payload/Library/Scripts/install_or_defer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payload/Library/Scripts/install_or_defer.sh b/payload/Library/Scripts/install_or_defer.sh index 1b83b89..e0c1691 100644 --- a/payload/Library/Scripts/install_or_defer.sh +++ b/payload/Library/Scripts/install_or_defer.sh @@ -133,7 +133,7 @@ check_for_updates () { # Download updates (all updates if a restart is required for any, otherwise # just recommended updates). echo "Caching $installWhich system updates..." - softwareupdate --download --$installWhich + softwareupdate --download --$installWhich --no-scan } @@ -186,7 +186,7 @@ run_updates () { echo "Running $installWhich system updates..." "$jamfHelper" -windowType "hud" -windowPosition "ur" -icon "$LOGO" -title "$MSG_UPDATING_HEADING" -description "$MSG_UPDATING" -lockHUD & - updateOutputCapture="$(softwareupdate --install --$installWhich 2>&1)" + updateOutputCapture="$(softwareupdate --install --$installWhich --no-scan 2>&1)" echo "Finished running updates." killall jamfHelper 2>/dev/null clean_up From 643d1debe89d1d5b66c9b7b60aa5b0d08ee4aba5 Mon Sep 17 00:00:00 2001 From: Mario Panighetti Date: Thu, 11 Apr 2019 11:18:36 -0700 Subject: [PATCH 2/2] iterated version - iterated version to 2.1.3 --- build-info.plist | 2 +- payload/Library/Scripts/install_or_defer.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-info.plist b/build-info.plist index 9b60861..7cd5125 100644 --- a/build-info.plist +++ b/build-info.plist @@ -17,6 +17,6 @@ suppress_bundle_relocation version - 2.1.2 + 2.1.3 diff --git a/payload/Library/Scripts/install_or_defer.sh b/payload/Library/Scripts/install_or_defer.sh index e0c1691..087f0b1 100644 --- a/payload/Library/Scripts/install_or_defer.sh +++ b/payload/Library/Scripts/install_or_defer.sh @@ -13,8 +13,8 @@ # restarts automatically. # Authors: Elliot Jordan and Mario Panighetti # Created: 2017-03-09 -# Last Modified: 2019-04-10 -# Version: 2.1.2 +# Last Modified: 2019-04-11 +# Version: 2.1.3 # ###