From 5c0c95887aa7cb82c7c20010b312710341395a9d Mon Sep 17 00:00:00 2001 From: "Dan K. Snelson" Date: Sat, 1 Apr 2023 15:45:00 -0600 Subject: [PATCH] 1.9.0 --- CHANGELOG.md | 1 + Setup-Your-Mac-via-Dialog.bash | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1039c50..a438361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Updated icon hashes - `toggleJamfLaunchDaemon` function ([Pull Request No. 16](https://github.com/dan-snelson/Setup-Your-Mac/pull/16); thanks, @robjschroeder!) - Formatted policyJSON with [Erik Lynd's JSON Tools](https://marketplace.visualstudio.com/items?itemName=eriklynd.json-tools) +- Corrected an issue where inventory would be submitted twice (thanks, @Manikandan!) ## 1.8.1 ### 11-Mar-2023 diff --git a/Setup-Your-Mac-via-Dialog.bash b/Setup-Your-Mac-via-Dialog.bash index a6568be..b5ca090 100644 --- a/Setup-Your-Mac-via-Dialog.bash +++ b/Setup-Your-Mac-via-Dialog.bash @@ -9,7 +9,7 @@ # # HISTORY # -# Version 1.9.0, 03-Apr-2023, Dan K. Snelson (@dan-snelson) +# Version 1.9.0, 01-Apr-2023, Dan K. Snelson (@dan-snelson) # - Previously installed apps with a `filepath` validation now display "Previously Installed" (instead of a generic "Installed"; Issue No. 13; thanks for the idea, @Manikandan!) # - Allow "first name" to correctly handle names in "Lastname, Firstname" format (Pull Request No. 11; thanks, @meschwartz!) # - Corrected `PATH` (thanks, @Theile!) @@ -17,6 +17,7 @@ # - Updated icon hashes # - New `toggleJamfLaunchDaemon` function (Pull Request No. 16; thanks, @robjschroeder!) # - Formatted policyJSON with [Erik Lynd's JSON Tools](https://marketplace.visualstudio.com/items?itemName=eriklynd.json-tools) +# - Corrected an issue where inventory would be submitted twice (thanks, @Manikandan!) # #################################################################################################### @@ -1397,8 +1398,8 @@ function run_jamf_trigger() { elif [[ "$trigger" == "recon" ]]; then dialogUpdateSetupYourMac "listitem: index: $i, status: wait, statustext: Updating …, " - updateScriptLog "SETUP YOUR MAC DIALOG: Updating computer inventory with the following reconOptions: \"${reconOptions}\" …" - eval "${jamfBinary} recon ${reconOptions}" + updateScriptLog "SETUP YOUR MAC DIALOG: Computer inventory, with the following reconOptions: \"${reconOptions}\", will be be executed in the 'confirmPolicyExecution' function …" + # eval "${jamfBinary} recon ${reconOptions}" else