Skip to content

Commit

Permalink
1.12.6
Browse files Browse the repository at this point in the history
Signed-off-by: Dan K. Snelson <[email protected]>
  • Loading branch information
dan-snelson committed Aug 30, 2023
1 parent 568f200 commit 19dd001
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 1.12.6
### 30-Aug-2023
- Reverted `mktemp`-created files to pre-SYM `1.12.1` behaviour
- Updated required version of swiftDialog to `2.3.2.4726`

## 1.12.5
### 28-Aug-2023
- Added `sleep "${debugModeSleepAmount}"` to `recon` validation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Setup Your Mac (1.12.5) via swiftDialog (2.3.1)
# Setup Your Mac (1.12.6) 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)

Expand Down
22 changes: 11 additions & 11 deletions Setup-Your-Mac-via-Dialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
# Version 1.12.5, 28-Aug-2023, Dan K. Snelson (@dan-snelson)
# - Added `sleep "${debugModeSleepAmount}"` to `recon` validation
#
# Version 1.12.6, 30-Aug-2023, Dan K. Snelson (@dan-snelson)
# - Reverted `mktemp`-created files to pre-SYM `1.12.1` behaviour
# - Updated required version of swiftDialog to `2.3.2.4726`
#
####################################################################################################


Expand All @@ -65,7 +69,7 @@
# Script Version and Jamf Pro Script Parameters
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="1.12.5"
scriptVersion="1.12.6"
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 @@ -465,9 +469,9 @@ function dialogCheck() {
else

dialogVersion=$(/usr/local/bin/dialog --version)
if [[ "${dialogVersion}" < "2.3.1.4721" ]]; then
if [[ "${dialogVersion}" < "2.3.2.4726" ]]; then

updateScriptLog "PRE-FLIGHT CHECK: swiftDialog version ${dialogVersion} found but swiftDialog 2.3.0.4718 or newer is required; updating..."
updateScriptLog "PRE-FLIGHT CHECK: swiftDialog version ${dialogVersion} found but swiftDialog 2.3.2.4726 or newer is required; updating..."
dialogInstall

else
Expand Down Expand Up @@ -527,14 +531,10 @@ esac

jamfBinary="/usr/local/bin/jamf"
dialogBinary="/usr/local/bin/dialog"
welcomeJSONFile=$( mktemp /var/tmp/welcomeJSONFile.XXX )
welcomeCommandFile=$( mktemp /var/tmp/dialogCommandFileWelcome.XXX )
setupYourMacCommandFile=$( mktemp /var/tmp/dialogCommandFileSetupYourMac.XXX )
failureCommandFile=$( mktemp /var/tmp/dialogCommandFileFailure.XXX )

# Set permissions on Dialog Files
chmod -v 666 "${welcomeJSONFile}"
chmod -v 666 /var/tmp/dialogCommandFile*
welcomeJSONFile=$( mktemp -u /var/tmp/welcomeJSONFile.XXX )
welcomeCommandFile=$( mktemp -u /var/tmp/dialogCommandFileWelcome.XXX )
setupYourMacCommandFile=$( mktemp -u /var/tmp/dialogCommandFileSetupYourMac.XXX )
failureCommandFile=$( mktemp -u /var/tmp/dialogCommandFileFailure.XXX )



Expand Down

0 comments on commit 19dd001

Please sign in to comment.