some more various fixes before 0.3 release

This commit is contained in:
Armin Briegel
2020-07-23 13:26:27 +02:00
parent 56e38de821
commit ea2d4d47e5

View File

@@ -557,6 +557,7 @@ iterm2)
type="zip" type="zip"
downloadURL="https://iterm2.com/downloads/stable/latest" downloadURL="https://iterm2.com/downloads/stable/latest"
expectedTeamID="H7V7XYVQ7D" expectedTeamID="H7V7XYVQ7D"
blockingProcesses=( iTerm2 )
;; ;;
royaltsx) royaltsx)
name="Royal TSX" name="Royal TSX"
@@ -763,19 +764,19 @@ r)
expectedTeamID="VZLD955F6P" expectedTeamID="VZLD955F6P"
;; ;;
8x8) 8x8)
# credit: #D-A-James from MacAdmins Slack # credit: #D-A-James from MacAdmins Slack and Isaac Ordonez, Mann consulting (@mannconsulting)
name="8x8 - Virtual Office" name="8x8 - Virtual Office"
type="dmg" type="dmg"
downloadURL='https://support.8x8.com/cloud-phone-service/voice/virtual-office-desktop/download-virtual-office-desktop' downloadURL=$(curl -fs https://support.8x8.com/cloud-phone-service/voice/virtual-office-desktop/download-virtual-office-desktop | grep -m 1 -o "http.*VOD.*.dmg")
expectedTeamID="FC967L3QRG" expectedTeamID="FC967L3QRG"
;; ;;
egnyte) egnyte)
# credit: #MoeMunyoki from MacAdmins Slack # credit: #MoeMunyoki from MacAdmins Slack
name="Egnyte Connect" name="Egnyte Connect"
type="pkg" type="pkg"
downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg" downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg"
expectedTeamID="FELUD555VC" expectedTeamID="FELUD555VC"
BLOCKING_PROCESS_ACTION=ignore blockingProcesses=( NONE )
;; ;;
# MARK: add new labels above here # MARK: add new labels above here
@@ -1005,7 +1006,7 @@ runAsUser() {
displaydialog() { # $1: message $2: title displaydialog() { # $1: message $2: title
message=${1:-"Message"} message=${1:-"Message"}
title=${2:-"Installomator"} title=${2:-"Installomator"}
runAsUser /usr/bin/osascript -e "button returned of (display dialog \"$message\" with title \"$title\" buttons {\"Not Now\", \"Quit and Update\"} default button \"Quit and Update\")" runAsUser osascript -e "button returned of (display dialog \"$message\" with title \"$title\" buttons {\"Not Now\", \"Quit and Update\"} default button \"Quit and Update\")"
} }
displaynotification() { # $1: message $2: title displaynotification() { # $1: message $2: title
@@ -1071,7 +1072,7 @@ checkRunningProcesses() {
if [[ $button = "Not Now" ]]; then if [[ $button = "Not Now" ]]; then
cleanupAndExit 10 "user aborted update" cleanupAndExit 10 "user aborted update"
else else
runAsUser osascript -e "tell app $x to quit" runAsUser osascript -e "tell app \"$x\" to quit"
fi fi
;; ;;
silent_fail) silent_fail)