Skip to content

Commit

Permalink
updated 'dialogURL'
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 Sep 9, 2023
1 parent a3e3f84 commit f23fb45
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 18 deletions.
9 changes: 6 additions & 3 deletions Disk Usage/Disk Usage with swiftDialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
# Hard-coded estimated execution time for user's home folder to 60 percent
# Opened the macOS built-in Storage information
#
# Version 0.0.3, 14-Nov-2022,
# Version 0.0.3, 14-Nov-2022, Dan K. Snelson (@dan-snelson)
# Modified du's stderr redirection (thanks, @Pico!)
#
# Version 0.0.4, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# Updated `dialogURL`
#
####################################################################################################


Expand All @@ -37,7 +40,7 @@
# Global Variables
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="0.0.3"
scriptVersion="0.0.4"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/
loggedInUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' )
loggedInUserHome=$( dscl . read /Users/"${loggedInUser}" NFSHomeDirectory | awk -F ": " '{print $2}' )
Expand Down Expand Up @@ -229,7 +232,7 @@ function jamfDisplayMessage() {
function dialogCheck() {

# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down
7 changes: 5 additions & 2 deletions Display Message/Display-Message-via-Dialog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
# Version 0.0.8, 30-Mar-2023, Dan K. Snelson (@dan-snelson)
# - Updated default dialog instructions to include an `action`
#
# Version 0.0.9, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# - Updated `dialogURL`
#
####################################################################################################


Expand All @@ -53,7 +56,7 @@
#
####################################################################################################

scriptVersion="0.0.8"
scriptVersion="0.0.9"
scriptLog="/var/tmp/org.churchofjesuschrist.log"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
loggedInUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' )
Expand Down Expand Up @@ -137,7 +140,7 @@ fi
function dialogCheck() {

# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
# Version 0.0.5, 27-Dec-2022, Dan K. Snelson (@dan-snelson)
# Provided alternate `recon` option to address Issue No. 24
#
# Version 0.0.6, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# - Updated `dialogURL`
#
####################################################################################################


Expand All @@ -37,7 +40,7 @@
#
####################################################################################################

scriptVersion="0.0.5"
scriptVersion="0.0.6"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/
loggedInUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' )
osVersion=$( /usr/bin/sw_vers -productVersion )
Expand Down Expand Up @@ -141,7 +144,7 @@ function jamfDisplayMessage() {

function dialogCheck(){
# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down
13 changes: 8 additions & 5 deletions csf-Diagnose.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
# HISTORY
#
# Version 0.0.1, 06-Feb-2023, Dan K. Snelson (@dan-snelson)
# Original version
# - Original version
#
# Version 0.0.2, 13-Mar-2023, Dan K. Snelson (@dan-snelson)
# Prepend Serial Number on output file
# - Prepend Serial Number on output file
#
# Version 0.0.3, 14-Mar-2023, Dan K. Snelson (@dan-snelson)
# Modified `find` command (thanks, @Samantha Demi and @Pico)
# - Modified `find` command (thanks, @Samantha Demi and @Pico)
#
# Version 0.0.4, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# - Updated `dialogURL`
#
####################################################################################################

Expand All @@ -29,7 +32,7 @@
#
####################################################################################################

scriptVersion="0.0.3"
scriptVersion="0.0.4"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
falconBinary="/Applications/Falcon.app/Contents/Resources/falconctl"
osVersion=$( /usr/bin/sw_vers -productVersion )
Expand Down Expand Up @@ -134,7 +137,7 @@ fi
function dialogCheck() {

# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down
7 changes: 5 additions & 2 deletions csf-Inspector.bash
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# Version 0.0.2, 11-Nov-2022, Dan K. Snelson (@dan-snelson)
# Corrected button enablement on completion
#
# Version 0.0.3, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# - Updated `dialogURL`
#
####################################################################################################


Expand All @@ -31,7 +34,7 @@
# Global Variables
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="0.0.2"
scriptVersion="0.0.3"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/
loggedInUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' )
osVersion=$( sw_vers -productVersion )
Expand Down Expand Up @@ -120,7 +123,7 @@ function jamfDisplayMessage() {
function dialogCheck() {

# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down
7 changes: 5 additions & 2 deletions swiftDialog Commander/swiftDialogCommander.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
# Version 0.0.3, 06-Jun-2022, Dan K. Snelson (@dan-snelson)
# Added link to blog post for additional examples
#
# Version 0.0.4, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# Updated `dialogURL`
#
####################################################################################################


Expand All @@ -36,7 +39,7 @@
# Script Version
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

scriptVersion="0.0.3"
scriptVersion="0.0.4"



Expand Down Expand Up @@ -189,7 +192,7 @@ function dialog_update() {

function dialogCheck(){
# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"

Expand Down
7 changes: 5 additions & 2 deletions sysdiagnose Progress/swiftDialog-sysdiagnose-Progress.bash
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
# Updated `sed` regex (thanks, @Nick Koval!)
# Updated `updateScriptLog` function (thanks, @tlark!)
#
# Version 1.3.2, 09-Sep-2023, Dan K. Snelson (@dan-snelson)
# Updated `dialogURL`
#
####################################################################################################


Expand All @@ -37,7 +40,7 @@
#
####################################################################################################

scriptVersion="1.3.1"
scriptVersion="1.3.2"
export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/
loggedInUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' )
loggedInUserHome=$( dscl . read /Users/"${loggedInUser}" NFSHomeDirectory | awk -F ": " '{print $2}' )
Expand Down Expand Up @@ -207,7 +210,7 @@ function jamfDisplayMessage() {

function dialogCheck(){
# Get the URL of the latest PKG From the Dialog GitHub repo
dialogURL=$(curl --silent --fail "https://api.github.com/repos/bartreardon/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
dialogURL=$(curl -L --silent --fail "https://api.github.com/repos/swiftDialog/swiftDialog/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")

# Expected Team ID of the downloaded PKG
expectedDialogTeamID="PWA5E9TQ59"
Expand Down

0 comments on commit f23fb45

Please sign in to comment.