Skip to content

Commit b2d4519

Browse files
authored
Merge pull request #138 from setup-your-mac/1.14.1
1.14.1
2 parents f9f10c9 + 913751e commit b2d4519

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 1.14.1
4+
### 11-Feb-2024
5+
- Addressed an issue where icons were not displaying (thanks, @bartreardon!)
6+
37
## 1.14.0
48
### 05-Feb-2024
59
- Updated Vimeo ID

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
### Humbled & Amazed
1717

1818
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:
19+
- bartreardon for helping to resolve an issue when icons were not displaying as expected
1920
- Honestpuck for [Issue No. 134](https://github.com/setup-your-mac/Setup-Your-Mac/issues/134)
2021
- robjschroeder for [Pull Request No. 128](https://github.com/setup-your-mac/Setup-Your-Mac/pull/128)
2122
- drtaru for [Pull Request No. 131](https://github.com/setup-your-mac/Setup-Your-Mac/pull/131)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!-- markdownlint-disable-next-line first-line-heading no-inline-html -->
22
[<img align="left" alt="Setup Your Mac (1.14.0)" src="images/SYM_icon.png" width="128" />](https://snelson.us/sym)
33

4-
# Setup Your Mac (1.14.0) with SYM-Helper (1.1.1) via swiftDialog (2.4.0)
4+
# Setup Your Mac (1.14.1) with SYM-Helper (1.1.1) via swiftDialog (2.4.1)
55

66
![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)
77

88
> Optimized to leverage SYM-Helper (1.1.1), Setup Your Mac (1.14.0) leverages new features of swiftDialog (2.4.0)
99
10-
[<img alt="Setup Your Mac (1.14.0)" src="images/SYM-Helper_1.1.1_SYM-1.14.0_Hero.png" />](https://snelson.us/sym)
10+
[<img alt="Setup Your Mac (1.14.1)" src="images/SYM-Helper_1.1.1_SYM-1.14.0_Hero.png" />](https://snelson.us/sym)
1111

1212

1313
## Introduction

Setup-Your-Mac-via-Dialog.bash

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
# - Corrected misspelling of "policies" in log entries [Issue No. 134](https://github.com/setup-your-mac/Setup-Your-Mac/issues/134); thanks, @Honestpuck!
2424
# - Updated `brandingBanner` to [image by benzoix on Freepik](https://www.freepik.com/author/benzoix)
2525
#
26+
# Version 1.14.1, 11-Feb-2024
27+
# - Addressed an issue where icons were not displaying (thanks, @bartreardon!)
28+
#
2629
####################################################################################################
2730

2831

@@ -37,7 +40,7 @@
3740
# Script Version and Jamf Pro Script Parameters
3841
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
3942

40-
scriptVersion="1.14.0"
43+
scriptVersion="1.14.1"
4144
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
4245
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)
4346
debugMode="${5:-"verbose"}" # Parameter 5: Debug Mode [ verbose (default) | true | false ]
@@ -770,7 +773,7 @@ welcomeJSON='
770773
"message" : "'"${welcomeMessage}"'",
771774
"icon" : "'"${welcomeIcon}"'",
772775
"infobox" : "Analyzing …",
773-
"iconsize" : "198.0",
776+
"iconsize" : "198",
774777
"button1text" : "Continue",
775778
"button2text" : "Quit",
776779
"infotext" : "'"${scriptVersion}"'",
@@ -2823,7 +2826,7 @@ elif [[ "${welcomeDialog}" == "messageOnly" ]]; then
28232826
"message" : "'"${welcomeMessage}"'",
28242827
"icon" : "'"${welcomeIcon}"'",
28252828
"infobox" : "",
2826-
"iconsize" : "198.0",
2829+
"iconsize" : "198",
28272830
"button1text" : "Continue",
28282831
"timer" : "60",
28292832
"infotext" : "'"${scriptVersion}"'",
@@ -3358,4 +3361,4 @@ done
33583361

33593362
outputLineNumberInVerboseDebugMode
33603363

3361-
finalise
3364+
finalise

0 commit comments

Comments
 (0)