Skip to content

Commit

Permalink
1.12.12: Added a failure indication when a 'Local' validation trigger…
Browse files Browse the repository at this point in the history
… does not exist in the main script. PR #117; thanks for another one, drtaru

Signed-off-by: Dan K. Snelson <[email protected]>
  • Loading branch information
dan-snelson committed Sep 28, 2023
1 parent 19994af commit 4ffc94a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 1.12.12
### 28-Sep-2023
- Added a failure indication when a "Local" validation trigger does not exist in the main script ([Pull Request No. 117](https://github.com/dan-snelson/Setup-Your-Mac/pull/117); thanks for another one, @drtaru!)

## 1.12.11
### 26-Sep-2023
- Restored logging of `jamfProPolicyNameFailures`
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
### Humbled & Amazed

The response to Setup Your Mac has been both humbling and amazing; my personal thanks to MacAdmins worldwide and the ever-growing number of contributors:
- @all-contributors please add @drtaru for [117](https://github.com/dan-snelson/Setup-Your-Mac/pull/117)
- @all-contributors please add @delize for [115](https://github.com/dan-snelson/Setup-Your-Mac/pull/116)
- @all-contributors please add @Honestpuck for [105](https://github.com/dan-snelson/Setup-Your-Mac/pull/105)
- @all-contributors please add @Honestpuck for [104](https://github.com/dan-snelson/Setup-Your-Mac/issues/104)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[<img alt="Setup Your Mac (1.12.0)" src="images/SYM_icon.png" width="128" />](https://snelson.us/sym)

# Setup Your Mac (1.12.11) via swiftDialog (2.3.2)
# Setup Your Mac (1.12.12) via swiftDialog (2.3.2)

![GitHub release (latest by date)](https://img.shields.io/github/v/release/dan-snelson/Setup-Your-Mac?display_name=tag) ![GitHub issues](https://img.shields.io/github/issues-raw/dan-snelson/Setup-Your-Mac) ![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/dan-snelson/Setup-Your-Mac) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/dan-snelson/Setup-Your-Mac) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/dan-snelson/Setup-Your-Mac) ![GitHub contributors (via allcontributors.org)](https://img.shields.io/github/all-contributors/dan-snelson/Setup-Your-Mac/main)

> With more accurate Dynamic Download Estimates, additional user-input fields and multiple speed improvements, Setup Your Mac (1.12.11) helps MacAdmins provide their users a seamless onboarding experience via swiftDialog (2.3.2).
> With more accurate Dynamic Download Estimates, additional user-input fields and multiple speed improvements, Setup Your Mac (1.12.12) helps MacAdmins provide their users a seamless onboarding experience via swiftDialog (2.3.2).
[<img alt="Setup Your Mac (1.12.0)" src="images/Setup_Your_Mac_1.12.0_estimates.png" />](https://snelson.us/sym)

Expand Down
7 changes: 5 additions & 2 deletions Setup-Your-Mac-via-Dialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
# - Restored logging of `jamfProPolicyNameFailures`
# - Updated `if … then` statements when disabling the "Continue" button in the User Input "Welcome" dialog until Dynamic Download Estimates have complete ([Pull Request No. 115](https://github.com/dan-snelson/Setup-Your-Mac/pull/116); thanks, @delize!)
#
# Version 1.12.12, 28-Sep-2023, Dan K. Snelson (@dan-snelson)
# - Added a failure indication when a "Local" validation trigger does not exist in the main script ([Pull Request No. 117](https://github.com/dan-snelson/Setup-Your-Mac/pull/117); thanks for another one, @drtaru!)
#
####################################################################################################


Expand All @@ -91,7 +94,7 @@
# Script Version and Jamf Pro Script Parameters
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="1.12.11"
scriptVersion="1.12.12"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
scriptLog="${4:-"/var/log/org.churchofjesuschrist.log"}" # Parameter 4: Script Log Location [ /var/log/org.churchofjesuschrist.log ] (i.e., Your organization's default location for client-side logs)
debugMode="${5:-"verbose"}" # Parameter 5: Debug Mode [ verbose (default) | true | false ]
Expand Down Expand Up @@ -2086,7 +2089,7 @@ function validatePolicyResult() {
;;
* )
updateScriptLog "SETUP YOUR MAC DIALOG: Locally Validate Policy Result: Local Validation “${validation}” Missing"
dialogUpdateSetupYourMac "listitem: index: $i, status: fail, statustext: Missing Local Validation"
dialogUpdateSetupYourMac "listitem: index: $i, status: fail, statustext: Missing Local ${validation}Validation"
jamfProPolicyTriggerFailure="failed"
exitCode="1"
jamfProPolicyNameFailures+="$listitem \n"
Expand Down

0 comments on commit 4ffc94a

Please sign in to comment.