1.12.10

Signed-off-by: Dan K. Snelson <dan@snelson.us>

Author: dan-snelson

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.12.10
+### 15-Sep-2023
+- Better WelcomeMessage logic and variable handling ([Pull Request No. 101](https://github.com/dan-snelson/Setup-Your-Mac/pull/101); thanks big bunches, @GadgetGeekNI!)
+
 ## 1.12.9
 ### 15-Sep-2023
 - Added `-L` to `curl` command when caching banner images (thanks for the suggestion, @bartreardon!)

Prompt-to-Setup-Your-Mac.bash

@@ -29,7 +29,7 @@
 # Version 0.0.5, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
 #   - Updated `dialogURL`
 #
-# Version 1.12.9, 15-Sep-2023, Dan K. Snelson (@dan-snelson)
+# Version 1.12.10, 15-Sep-2023, Dan K. Snelson (@dan-snelson)
 #   - Reverted `mktemp`-created files to pre-SYM `1.12.1` behaviour
 #   - Matched SYM version number
 #
@@ -68,7 +68,7 @@ fi
 # Global variables
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-scriptVersion="1.12.9"
+scriptVersion="1.12.10"
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 secondsToWait="${4:-"2700"}"                                    # Parameter 4: "secondsToWait" setting; defaults to "2700"
 scriptLog="/var/log/org.churchofjesuschrist.log"                # Your organization's default location for client-side logs

README.md

@@ -1,9 +1,9 @@
 [<img alt="Setup Your Mac (1.12.0)" src="images/SYM_icon.png" width="128" />](https://snelson.us/sym)
-# Setup Your Mac (1.12.9) via swiftDialog (2.3.2)
+# Setup Your Mac (1.12.10) 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)
 
-> With more accurate Dynamic Download Estimates, additional user-input fields and multiple speed improvements, Setup Your Mac (1.12.9) helps MacAdmins provide their users a seamless onboarding experience via swiftDialog (2.3.2).
+> With more accurate Dynamic Download Estimates, additional user-input fields and multiple speed improvements, Setup Your Mac (1.12.10) helps MacAdmins provide their users a seamless onboarding experience via swiftDialog (2.3.2).
 
 [<img alt="Setup Your Mac (1.12.0)" src="images/Setup_Your_Mac_1.12.0_estimates.png" />](https://snelson.us/sym)
 

Setup-Your-Mac-via-Dialog.bash

@@ -70,6 +70,9 @@
 #   - Hide unused Support variables ([Pull Request No. 99](https://github.com/dan-snelson/Setup-Your-Mac/pull/99); thanks again, @GadgetGeekNI!)
 #   - Added Pre-flight Check: Validate `supportTeam` variables are populated ([Pull Request No. 100](https://github.com/dan-snelson/Setup-Your-Mac/pull/100); thanks for another one, @GadgetGeekNI!)
 #
+#   Version 1.12.10, 15-Sep-2023, Dan K. Snelson (@dan-snelson)
+#   - Better WelcomeMessage logic and variable handling ([Pull Request No. 101](https://github.com/dan-snelson/Setup-Your-Mac/pull/101); thanks big bunches, @GadgetGeekNI!)
+#
 ####################################################################################################
 
 
@@ -84,7 +87,7 @@
 # Script Version and Jamf Pro Script Parameters
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-scriptVersion="1.12.9"
+scriptVersion="1.12.10"
 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 ]
@@ -149,9 +152,9 @@ brandingIconLight="https://cdn-icons-png.flaticon.com/512/979/979585.png"
 brandingIconDark="https://cdn-icons-png.flaticon.com/512/740/740878.png"
 
 # IT Support Variables - Use these if the default text is fine but you want your org's info inserted instead
-supportTeamName="Help Desk"
+supportTeamName="Support Team Name"
 supportTeamPhone="+1 (801) 555-1212"
-supportTeamEmail="RescueMe@domain.com"
+supportTeamEmail="support@domain.com"
 supportKB="KB8675309"
 supportTeamErrorKB=", and mention [${supportKB}](https://servicenow.company.com/support?id=kb_article_view&sysparm_article=${supportKB}#Failures)"
 supportTeamHelpKB="\n- **Knowledge Base Article:** ${supportKB}"
@@ -528,7 +531,7 @@ if [[ -z $supportTeamName ]]; then
 fi
 
 if [[ -z $supportTeamPhone && -z $supportTeamEmail && -z $supportKB ]]; then
-    updateScriptLog "PRE-FLIGHT CHECK: At least **one** 'supportTeam' variable must be populated to proceed; exiting"
+    updateScriptLog "PRE-FLIGHT CHECK: At least ONE 'supportTeam' variable must be populated to proceed; exiting"
     exit 1
 fi
 
@@ -602,19 +605,19 @@ if [ -n "$supportTeamName" ]; then
   welcomeMessage+="\n\nIf you need assistance, please contact the ${supportTeamName}:"
 
     if [ -n "$supportTeamPhone" ]; then
-        welcomeMessage+="\n - **Via Phone** : ${supportTeamPhone}"
+        welcomeMessage+="\n - **Phone**: ${supportTeamPhone}"
     fi
 
     if [ -n "$supportTeamEmail" ]; then
-        welcomeMessage+="\n - **Via Email** : ${supportTeamEmail}"
+        welcomeMessage+="\n - **Email**: ${supportTeamEmail}"
     fi
 
     if [ -n "$supportKB" ]; then
         welcomeMessage+=" and mention ${supportKB}"
     fi
 fi
 
-welcomeMessage+=".\n\n---"
+welcomeMessage+="\n\n---"
 
 if { [[ "${promptForConfiguration}" == "true" ]] && [[ "${welcomeDialog}" != "messageOnly" ]]; } then
     welcomeMessage+="  \n\n#### Configurations  \n- **${configurationOneName}:** ${configurationOneDescription}  \n- **${configurationTwoName}:** ${configurationTwoDescription}  \n- **${configurationThreeName}:** ${configurationThreeDescription}"