|
51 | 51 | # Version 1.12.5, 28-Aug-2023, Dan K. Snelson (@dan-snelson) |
52 | 52 | # - Added `sleep "${debugModeSleepAmount}"` to `recon` validation |
53 | 53 | # |
| 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 | +# |
54 | 58 | #################################################################################################### |
55 | 59 |
|
56 | 60 |
|
|
65 | 69 | # Script Version and Jamf Pro Script Parameters |
66 | 70 | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # |
67 | 71 |
|
68 | | -scriptVersion="1.12.5" |
| 72 | +scriptVersion="1.12.6" |
69 | 73 | export PATH=/usr/bin:/bin:/usr/sbin:/sbin |
70 | 74 | 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) |
71 | 75 | debugMode="${5:-"verbose"}" # Parameter 5: Debug Mode [ verbose (default) | true | false ] |
@@ -465,9 +469,9 @@ function dialogCheck() { |
465 | 469 | else |
466 | 470 |
|
467 | 471 | dialogVersion=$(/usr/local/bin/dialog --version) |
468 | | - if [[ "${dialogVersion}" < "2.3.1.4721" ]]; then |
| 472 | + if [[ "${dialogVersion}" < "2.3.2.4726" ]]; then |
469 | 473 |
|
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..." |
471 | 475 | dialogInstall |
472 | 476 |
|
473 | 477 | else |
@@ -527,14 +531,10 @@ esac |
527 | 531 |
|
528 | 532 | jamfBinary="/usr/local/bin/jamf" |
529 | 533 | 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 ) |
538 | 538 |
|
539 | 539 |
|
540 | 540 |
|
|
0 commit comments