From c84e9bafa7e1f1c07cac9c5e9b80b835036b491e Mon Sep 17 00:00:00 2001
From: Amado Tejada <44622125+amadotejada@users.noreply.github.com>
Date: Fri, 7 Apr 2023 18:01:25 -0400
Subject: [PATCH 1/2] check bannerImage & welcomeBannerImage

---
 Setup-Your-Mac-via-Dialog.bash | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Setup-Your-Mac-via-Dialog.bash b/Setup-Your-Mac-via-Dialog.bash
index b5ca090..b4a6d8b 100644
--- a/Setup-Your-Mac-via-Dialog.bash
+++ b/Setup-Your-Mac-via-Dialog.bash
@@ -397,6 +397,14 @@ welcomeBannerText="Happy $( date +'%A' ), ${loggedInUserFirstname} and welcome t
 welcomeCaption="Please review the above video, then click Continue."
 welcomeVideoID="vimeoid=812753953"
 
+# Check if the custom welcomeBannerImage is available, and if not, use a alternative image
+if curl --output /dev/null --silent --head --fail "$welcomeBannerImage"; then
+    echo "welcomeBannerImage is available"
+else
+    echo "welcomeBannerImage is not available, using alternative image"
+    welcomeBannerImage="https://img.freepik.com/free-photo/yellow-watercolor-paper_95678-448.jpg"
+fi
+
 # Welcome icon set to either light or dark, based on user's Apperance setting (thanks, @mm2270!)
 appleInterfaceStyle=$( /usr/bin/defaults read /Users/"${loggedInUser}"/Library/Preferences/.GlobalPreferences.plist AppleInterfaceStyle 2>&1 )
 if [[ "${appleInterfaceStyle}" == "Dark" ]]; then
@@ -524,6 +532,14 @@ bannerText="Setting up ${loggedInUserFirstname}'s Mac"
 helpmessage="If you need assistance, please contact the Global Service Department:  \n- **Telephone:** +1 (801) 555-1212  \n- **Email:** support@domain.org  \n- **Knowledge Base Article:** KB0057050  \n\n**Computer Information:**  \n- **Operating System:**  ${macOSproductVersion} (${macOSbuildVersion})  \n- **Serial Number:** ${serialNumber}  \n- **Dialog:** ${dialogVersion}  \n- **Started:** ${timestamp}"
 infobox="Analyzing input …" # Customize at "Update Setup Your Mac's infobox"
 
+# Check if the custom bannerImage is available, and if not, use a alternative image
+if curl --output /dev/null --silent --head --fail "$bannerImage"; then
+    echo "bannerImage is available"
+else
+    echo "bannerImage is not available, using alternative image"
+    bannerImage="https://img.freepik.com/free-photo/yellow-watercolor-paper_95678-448.jpg"
+fi
+
 # Create `overlayicon` from Self Service's custom icon (thanks, @meschwartz!)
 xxd -p -s 260 "$(defaults read /Library/Preferences/com.jamfsoftware.jamf self_service_app_path)"/Icon$'\r'/..namedfork/rsrc | xxd -r -p > /var/tmp/overlayicon.icns
 overlayicon="/var/tmp/overlayicon.icns"

From 647241c9c263adf7ef7eca582390137bf7a25b74 Mon Sep 17 00:00:00 2001
From: Amado Tejada <44622125+amadotejada@users.noreply.github.com>
Date: Fri, 7 Apr 2023 20:03:03 -0400
Subject: [PATCH 2/2] replace `echo` with `updateScriptLog`

---
 Setup-Your-Mac-via-Dialog.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Setup-Your-Mac-via-Dialog.bash b/Setup-Your-Mac-via-Dialog.bash
index b4a6d8b..a8bd055 100644
--- a/Setup-Your-Mac-via-Dialog.bash
+++ b/Setup-Your-Mac-via-Dialog.bash
@@ -399,9 +399,9 @@ welcomeVideoID="vimeoid=812753953"
 
 # Check if the custom welcomeBannerImage is available, and if not, use a alternative image
 if curl --output /dev/null --silent --head --fail "$welcomeBannerImage"; then
-    echo "welcomeBannerImage is available"
+    updateScriptLog "WELCOME DIALOG: welcomeBannerImage is available, using it"
 else
-    echo "welcomeBannerImage is not available, using alternative image"
+    updateScriptLog "WELCOME DIALOG: welcomeBannerImage is not available, using a default image"
     welcomeBannerImage="https://img.freepik.com/free-photo/yellow-watercolor-paper_95678-448.jpg"
 fi
 
@@ -534,9 +534,9 @@ infobox="Analyzing input …" # Customize at "Update Setup Your Mac's infobox"
 
 # Check if the custom bannerImage is available, and if not, use a alternative image
 if curl --output /dev/null --silent --head --fail "$bannerImage"; then
-    echo "bannerImage is available"
+    updateScriptLog "WELCOME DIALOG: bannerImage is available"
 else
-    echo "bannerImage is not available, using alternative image"
+    updateScriptLog "WELCOME DIALOG: bannerImage is not available, using alternative image"
     bannerImage="https://img.freepik.com/free-photo/yellow-watercolor-paper_95678-448.jpg"
 fi