From 19dd0018910b1654c2d6763caa1d70dfc170bc9f Mon Sep 17 00:00:00 2001
From: "Dan K. Snelson" <dan@snelson.us>
Date: Wed, 30 Aug 2023 09:57:00 -0400
Subject: [PATCH] 1.12.6

Signed-off-by: Dan K. Snelson <dan@snelson.us>
---
 CHANGELOG.md                   |  5 +++++
 README.md                      |  2 +-
 Setup-Your-Mac-via-Dialog.bash | 22 +++++++++++-----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebf441c..8b28607 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/README.md b/README.md
index 44fc6fd..068c2a0 100644
--- a/README.md
+++ b/README.md
@@ -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)
 
diff --git a/Setup-Your-Mac-via-Dialog.bash b/Setup-Your-Mac-via-Dialog.bash
index f4a488e..f23a5a8 100755
--- a/Setup-Your-Mac-via-Dialog.bash
+++ b/Setup-Your-Mac-via-Dialog.bash
@@ -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`
+#
 ####################################################################################################
 
 
@@ -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 ]
@@ -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
@@ -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 )