mirror of
https://github.com/mtan93/Installomator.git
synced 2026-03-08 21:02:46 +00:00
added sfsymbols, special handling for Apple signed apps without teamID
This commit is contained in:
@@ -665,7 +665,12 @@ powershell-lts)
|
|||||||
expectedTeamID="M932RC5J66"
|
expectedTeamID="M932RC5J66"
|
||||||
blockingProcesses=( "Glip" )
|
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
|
# Note: Packages is signed but _not_ notarized, so spctl will reject it
|
||||||
# packages)
|
# packages)
|
||||||
@@ -1057,11 +1062,20 @@ installFromDMG() {
|
|||||||
installFromPKG() {
|
installFromPKG() {
|
||||||
# verify with spctl
|
# verify with spctl
|
||||||
printlog "Verifying: $archiveName"
|
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"
|
printlog "Error verifying $archiveName"
|
||||||
cleanupAndExit 4
|
cleanupAndExit 4
|
||||||
fi
|
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 )"
|
printlog "Team ID: $teamID (expected: $expectedTeamID )"
|
||||||
|
|
||||||
if [ "$expectedTeamID" != "$teamID" ]; then
|
if [ "$expectedTeamID" != "$teamID" ]; then
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ ringcentralapp
|
|||||||
ringcentralmeetings
|
ringcentralmeetings
|
||||||
royaltsx
|
royaltsx
|
||||||
santa
|
santa
|
||||||
|
sfsymbols
|
||||||
signal
|
signal
|
||||||
slack
|
slack
|
||||||
sonos
|
sonos
|
||||||
|
|||||||
Reference in New Issue
Block a user