Skip to content

Commit

Permalink
1.14.2
Browse files Browse the repository at this point in the history
Signed-off-by: Dan K. Snelson <[email protected]>
  • Loading branch information
dan-snelson committed Feb 15, 2024
2 parents b2d4519 + baa9676 commit 0494504
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 1.14.2
### 15-Feb-2024
- Addresses [Issue 139](https://github.com/setup-your-mac/Setup-Your-Mac/issues/139) `brandingBannerDisplayText=false` not working (thanks for the report, @seaneldridge7!)
Thanks for the fix, @drtaru! [Pull Request No. 140](https://github.com/setup-your-mac/Setup-Your-Mac/pull/140)

## 1.14.1
### 11-Feb-2024
- Addressed an issue where icons were not displaying (thanks, @bartreardon!)
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
### Humbled & Amazed

The response to Setup Your Mac has been both humbling and amazing; my personal thanks to MacAdmins worldwide and the ever-growing number of contributors:
- drtaru for [Pull Request No. 140](https://github.com/setup-your-mac/Setup-Your-Mac/pull/140)
- seaneldridge7 for [Issue No. 139](https://github.com/setup-your-mac/Setup-Your-Mac/issues/139)
- bartreardon for helping to resolve an issue when icons were not displaying as expected
- Honestpuck for [Issue No. 134](https://github.com/setup-your-mac/Setup-Your-Mac/issues/134)
- robjschroeder for [Pull Request No. 128](https://github.com/setup-your-mac/Setup-Your-Mac/pull/128)
Expand Down
15 changes: 11 additions & 4 deletions Setup-Your-Mac-via-Dialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
# Version 1.14.1, 11-Feb-2024
# - Addressed an issue where icons were not displaying (thanks, @bartreardon!)
#
# Version 1.14.2, 15-Feb-2024
# - Addresses [Issue 139](https://github.com/setup-your-mac/Setup-Your-Mac/issues/139) `brandingBannerDisplayText=false` not working (thanks for the report, @seaneldridge7!)
# Thanks for the fix, @drtaru! [Pull Request No. 140](https://github.com/setup-your-mac/Setup-Your-Mac/pull/140)
#
####################################################################################################


Expand All @@ -40,7 +44,7 @@
# Script Version and Jamf Pro Script Parameters
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="1.14.1"
scriptVersion="1.14.2"
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 ]
Expand Down Expand Up @@ -593,8 +597,11 @@ else
fi


if [[ "${brandingBannerDisplayText}" == "true" ]]; then welcomeBannerText="Happy $( date +'%A' ), ${loggedInUserFirstname}! \nWelcome to your new ${modelName}";
else welcomeBannerText=""; fi
if [[ "${brandingBannerDisplayText}" == "true" ]]; then
welcomeBannerText="Happy $( date +'%A' ), ${loggedInUserFirstname}! \nWelcome to your new ${modelName}"
else
welcomeBannerText=" "
fi
welcomeCaption="Please review the above video, then click Continue."
welcomeVideoID="vimeoid=909473114"

Expand Down Expand Up @@ -809,7 +816,7 @@ message="Please wait while the following apps are installed …"
if [[ "${brandingBannerDisplayText}" == "true" ]] ; then
bannerText="Setting up ${loggedInUserFirstname}‘s ${modelName}";
else
bannerText=""
bannerText=" "
fi

if [ -n "$supportTeamName" ]; then
Expand Down

0 comments on commit 0494504

Please sign in to comment.