Skip to content

Commit 19dd001

Browse files
committed
1.12.6
Signed-off-by: Dan K. Snelson <dan@snelson.us>
1 parent 568f200 commit 19dd001

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 1.12.6
4+
### 30-Aug-2023
5+
- Reverted `mktemp`-created files to pre-SYM `1.12.1` behaviour
6+
- Updated required version of swiftDialog to `2.3.2.4726`
7+
38
## 1.12.5
49
### 28-Aug-2023
510
- Added `sleep "${debugModeSleepAmount}"` to `recon` validation

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Setup Your Mac (1.12.5) via swiftDialog (2.3.1)
1+
# Setup Your Mac (1.12.6) via swiftDialog (2.3.2)
22

33
![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)
44

Setup-Your-Mac-via-Dialog.bash

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
# Version 1.12.5, 28-Aug-2023, Dan K. Snelson (@dan-snelson)
5252
# - Added `sleep "${debugModeSleepAmount}"` to `recon` validation
5353
#
54+
# Version 1.12.6, 30-Aug-2023, Dan K. Snelson (@dan-snelson)
55+
# - Reverted `mktemp`-created files to pre-SYM `1.12.1` behaviour
56+
# - Updated required version of swiftDialog to `2.3.2.4726`
57+
#
5458
####################################################################################################
5559

5660

@@ -65,7 +69,7 @@
6569
# Script Version and Jamf Pro Script Parameters
6670
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
6771

68-
scriptVersion="1.12.5"
72+
scriptVersion="1.12.6"
6973
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
7074
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)
7175
debugMode="${5:-"verbose"}" # Parameter 5: Debug Mode [ verbose (default) | true | false ]
@@ -465,9 +469,9 @@ function dialogCheck() {
465469
else
466470

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

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

473477
else
@@ -527,14 +531,10 @@ esac
527531

528532
jamfBinary="/usr/local/bin/jamf"
529533
dialogBinary="/usr/local/bin/dialog"
530-
welcomeJSONFile=$( mktemp /var/tmp/welcomeJSONFile.XXX )
531-
welcomeCommandFile=$( mktemp /var/tmp/dialogCommandFileWelcome.XXX )
532-
setupYourMacCommandFile=$( mktemp /var/tmp/dialogCommandFileSetupYourMac.XXX )
533-
failureCommandFile=$( mktemp /var/tmp/dialogCommandFileFailure.XXX )
534-
535-
# Set permissions on Dialog Files
536-
chmod -v 666 "${welcomeJSONFile}"
537-
chmod -v 666 /var/tmp/dialogCommandFile*
534+
welcomeJSONFile=$( mktemp -u /var/tmp/welcomeJSONFile.XXX )
535+
welcomeCommandFile=$( mktemp -u /var/tmp/dialogCommandFileWelcome.XXX )
536+
setupYourMacCommandFile=$( mktemp -u /var/tmp/dialogCommandFileSetupYourMac.XXX )
537+
failureCommandFile=$( mktemp -u /var/tmp/dialogCommandFileFailure.XXX )
538538

539539

540540

0 commit comments

Comments
 (0)