From 9bd79fc3e6ffda5c856f97e8c8c718bc5211cd05 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Tue, 9 Jun 2020 10:25:14 +0200 Subject: [PATCH] added sfsymbols, special handling for Apple signed apps without teamID --- Installomator.sh | 18 ++++++++++++++++-- Labels.txt | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Installomator.sh b/Installomator.sh index 4ba9095..0db9fdc 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -665,7 +665,12 @@ powershell-lts) expectedTeamID="M932RC5J66" blockingProcesses=( "Glip" ) ;; - + sfsymbols) + name="SF Symbols" + type="pkgInDmg" + downloadURL="https://developer.apple.com/design/downloads/SF-Symbols.dmg" + expectedTeamID="Software Update" + ;; # Note: Packages is signed but _not_ notarized, so spctl will reject it # packages) @@ -1057,10 +1062,19 @@ installFromDMG() { installFromPKG() { # verify with spctl printlog "Verifying: $archiveName" - if ! teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then + + if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then printlog "Error verifying $archiveName" cleanupAndExit 4 fi + + teamID=$(echo $spctlout | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' ) + echo $teamID + # Apple signed software has no teamID, grab entire origin instead + if [[ -z $teamID ]]; then + teamID=$(echo $spctlout | awk -F '=' '/origin=/ {print $NF }') + fi + printlog "Team ID: $teamID (expected: $expectedTeamID )" diff --git a/Labels.txt b/Labels.txt index 5079877..99fca75 100644 --- a/Labels.txt +++ b/Labels.txt @@ -65,6 +65,7 @@ ringcentralapp ringcentralmeetings royaltsx santa +sfsymbols signal slack sonos