1.10.0

Signed-off-by: Dan K. Snelson <[email protected]>
setup-your-mac · May 8, 2023 · f36433a · f36433a
1 parent 9ba77f3
commit f36433a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # CHANGELOG
 
 ## 1.10.0
-### TBD-May-2023
+### 08-May-2023
+[Release-specific Blog Post](https://snelson.us/2023/05/setup-your-mac-1-10-0-via-swiftdialog)
 - 🆕 **Dynamic Download Estimates** (Addresses [Issue No. 7](https://github.com/dan-snelson/Setup-Your-Mac/issues/7); thanks for the idea, @DevliegereM; heavy-lifting provided by @bartreardon!)
     - Manually set `configurationDownloadEstimation` within the SYM script to `true` to enable
     - New `calculateFreeDiskSpace` function will record free space to `scriptLog` before and after SYM execution
@@ -42,9 +43,11 @@
 - Added `trigger` `validation` to "Elapsed Time" output
 - Updated `webhookMessage` to include Slack functionality ([Pull Request No. 48](https://github.com/dan-snelson/Setup-Your-Mac/pull/48); thanks @iDrewbs!)
 - Add button to computer record for Slack webhook ([Pull Request No. 49](https://github.com/dan-snelson/Setup-Your-Mac/pull/49); thanks @drtaru!)
+- Fix Banner Text displaying when set to False ([Pull Request No. 51](https://github.com/dan-snelson/Setup-Your-Mac/pull/51); thanks @rougegoat!)
 
 ## 1.9.0
 ### 01-Apr-2023
+[Release-specific Blog Post](https://snelson.us/2023/04/setup-your-mac-1-9-0-via-swiftdialog/)
 - Previously installed apps with a `filepath` validation now display "Previously Installed" (instead of a generic "Installed"; [Issue No. 13](https://github.com/dan-snelson/Setup-Your-Mac/issues/13); thanks for the idea, @Manikandan!)
 - Allow "first name" to correctly handle names in "Lastname, Firstname" format ([Pull Request No. 11](https://github.com/dan-snelson/Setup-Your-Mac/pull/11); thanks @meschwartz!)
 - Corrected `PATH` (thanks, @Theile!)
@@ -56,6 +59,7 @@
 
 ## 1.8.1
 ### 11-Mar-2023
+[Release-specific Blog Post](https://snelson.us/2023/03/setup-your-mac-1-8-0-via-swiftdialog/)
 - Added `currentLoggedInUser` function to better validate `loggedInUser` (Addresses [Issue No. 2](https://github.com/dan-snelson/Setup-Your-Mac/issues/2))
 - Added new [Microsoft Office 365](/Setup-Your-Mac/Validations/Microsoft%20Office%20365.bash) Remote Validation ([Pull Request No. 3](https://github.com/dan-snelson/Setup-Your-Mac/pull/3))
 - Improved logging when `welcomeDialog` is `video` or `false` (Addresses [Issue No. 4](https://github.com/dan-snelson/Setup-Your-Mac/issues/4))
@@ -80,6 +84,7 @@
 
 ## 1.7.2
 ### 28-Feb-2023
+[Release-specific Blog Post](https://snelson.us/2023/02/setup-your-mac-via-swiftdialog-1-7-0/)
 - Reordered Pre-Flight Check to not validate OS until AFTER Setup Assistant / Finder & Dock
 - Added `disabled` option for `requiredMinimumBuild`
 - Added check for Self Service's `brandingimage.png` (Addresses [Issue No. 40](https://github.com/dan-snelson/dialog-scripts/issues/40))
@@ -88,7 +93,7 @@
 
 ## 1.7.1
 ### 07-Feb-2023
-
+[Release-specific Blog Post](https://snelson.us/2023/02/setup-your-mac-via-swiftdialog-1-7-0/)
 - Addresses [Issue No. 35](https://github.com/dan-snelson/dialog-scripts/issues/35)
 - Improves user-interaction with `helpmessage` under certain circumstances (thanks, @bartreardon!)
 - Increased `debugMode` delay (thanks for the heads-up, @Lewis B!)

diff --git a/README.md b/README.md
@@ -33,4 +33,4 @@ While we _thought_ we'd done everything to help ensure our users had a seamless
 [Continue reading …](https://snelson.us/2022/07/setup-your-mac-please/)
 
 ### Script
-- [Prompt-to-Setup-Your-Mac.bash](Prompt-to-Setup-Your-Mac.bash)
+- [Prompt-to-Setup-Your-Mac.bash](Prompt-to-Setup-Your-Mac.bash)
diff --git a/Setup-Your-Mac-via-Dialog.bash b/Setup-Your-Mac-via-Dialog.bash
@@ -10,7 +10,7 @@
 #
 # HISTORY
 #
-#   Version 1.10.0, Release Date TBD, Dan K. Snelson (@dan-snelson)
+#   Version 1.10.0, 08-May-2023, Dan K. Snelson (@dan-snelson)
 #   - 🆕 **Dynamic Download Estimates** (Addresses [Issue No. 7](https://github.com/dan-snelson/Setup-Your-Mac/issues/7); thanks for the idea, @DevliegereM; heavy-lifting provided by @bartreardon!)
 #       - Manually set `configurationDownloadEstimation` within the SYM script to `true` to enable
 #       - New `calculateFreeDiskSpace` function will record free space to `scriptLog` before and after SYM execution
@@ -66,7 +66,7 @@
 # Script Version and Jamf Pro Script Parameters
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-scriptVersion="1.10.0-rc31"
+scriptVersion="1.10.0"
 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 ]
@@ -2346,8 +2346,7 @@ function webHookMessage() {
         }
 EOF
 )
-
-
+
         # Send the message to Slack
         updateScriptLog "Send the message to Slack …"
         updateScriptLog "${webHookdata}"
@@ -2360,24 +2359,24 @@ EOF
 
     else
 
-    updateScriptLog "Generating Microsoft Teams Message …"
+        updateScriptLog "Generating Microsoft Teams Message …"
 
-    # Jamf Pro URL
-    jamfProURL=$(/usr/bin/defaults read /Library/Preferences/com.jamfsoftware.jamf.plist jss_url)
-
-    # Jamf Pro URL for on-prem, multi-node, clustered environments
-    # case ${jamfProURL} in
-    #     *"beta"*    ) jamfProURL="https://jamfpro-beta.internal.company.com/" ;;
-    #     *           ) jamfProURL="https://jamfpro-prod.internal.company.com/" ;;
-    # esac
+        # Jamf Pro URL
+        jamfProURL=$(/usr/bin/defaults read /Library/Preferences/com.jamfsoftware.jamf.plist jss_url)
+        
+        # Jamf Pro URL for on-prem, multi-node, clustered environments
+        # case ${jamfProURL} in
+        #     *"beta"*    ) jamfProURL="https://jamfpro-beta.internal.company.com/" ;;
+        #     *           ) jamfProURL="https://jamfpro-prod.internal.company.com/" ;;
+        # esac
 
-    # URL to computer object
-    jamfProComputerURL="${jamfProURL}computers.html?id=${computerID}&o=r"
+        # URL to computer object
+        jamfProComputerURL="${jamfProURL}computers.html?id=${computerID}&o=r"
 
-    # URL to an image to add to your notification
-    activityImage="https://creazilla-store.fra1.digitaloceanspaces.com/cliparts/78010/old-mac-computer-clipart-md.png"
+        # URL to an image to add to your notification
+        activityImage="https://creazilla-store.fra1.digitaloceanspaces.com/cliparts/78010/old-mac-computer-clipart-md.png"
 
-    webHookdata=$(cat <<EOF
+        webHookdata=$(cat <<EOF
 {
     "@type": "MessageCard",
     "@context": "http://schema.org/extensions",
@@ -2423,7 +2422,6 @@ EOF
 EOF
 )
 
-
     # Send the message to Microsoft Teams
     updateScriptLog "Send the message Microsoft Teams …"
     updateScriptLog "${webHookdata}"
@@ -2441,6 +2439,7 @@ EOF
 }
 
 
+
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Quit Script (thanks, @bartreadon!)
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #