Skip to content

Commit

Permalink
1.7.1-rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-snelson committed Feb 2, 2023
1 parent 4b9340c commit 64a59d6
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Setup Your Mac/Setup-Your-Mac-via-Dialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# Script Version, Jamf Pro Script Parameters and default Exit Code
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="1.7.1-rc1"
scriptVersion="1.7.1-rc2"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/
scriptLog="${4:-"/var/tmp/org.churchofjesuschrist.log"}" # Your organization's default location for client-side logs
debugMode="${5:-"verbose"}" # [ true | verbose (default) | false ]
Expand Down Expand Up @@ -246,7 +246,6 @@ function dialogCheck() {

}


dialogCheck


Expand Down Expand Up @@ -277,7 +276,6 @@ dialogVersion=$( /usr/local/bin/dialog --version )




# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Reflect Debug Mode in `infotext` (i.e., bottom, left-hand corner of each dialog)
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down Expand Up @@ -467,7 +465,7 @@ dialogSetupYourMacCMD="$dialogBinary \
--infotext \"$scriptVersion\" \
--titlefont 'shadow=true, size=40' \
--messagefont 'size=14' \
--height '775' \
--height '780' \
--position 'centre' \
--blurscreen \
--ontop \
Expand Down Expand Up @@ -1609,7 +1607,7 @@ if [[ "${welcomeDialog}" == "true" ]]; then

eval "${dialogSetupYourMacCMD[*]}" & sleep 0.3
dialogSetupYourMacProcessID=$!
osascript -e 'tell application "Dialog" to activate'
runAsUser osascript -e 'tell application "Dialog" to activate'
;;

2) # Process exit code 2 scenario here
Expand Down Expand Up @@ -1644,7 +1642,7 @@ else

eval "${dialogSetupYourMacCMD[*]}" & sleep 0.3
dialogSetupYourMacProcessID=$!
osascript -e 'tell application "Dialog" to activate'
runAsUser osascript -e 'tell application "Dialog" to activate'

fi

Expand Down

1 comment on commit 64a59d6

@dan-snelson
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should resolve #35

Please sign in to comment.