From 07efbb394fcd519bcc7de27e7e3a55d58d440e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 11 Apr 2022 09:02:00 +0200 Subject: [PATCH] Improved detection if signature was missing @scriptingosx: Wandering if we should just detect if Team IDs match anyway, and continue the installation no matter the gatekeeper setting for allowing App Store apps only. --- fragments/functions.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fragments/functions.sh b/fragments/functions.sh index 55c17db..4fbef76 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -426,7 +426,11 @@ installAppWithPath() { # $1: path to app to install in $targetDir if [[ $appVerifyStatus -ne 0 ]] ; then #if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then if [[ "$(echo $appVerify | head -1 | grep -oi rejected)" = "rejected" ]]; then - printlog "Gatekeeper check rejected. Could be that gatekeeper settings only accept App Store apps." ERROR + if [[ "$(echo $appVerify | tail -1)" = "source=no usable signature" ]]; then + printlog "Gatekeeper check rejected. No usable signature." ERROR + else + printlog "Gatekeeper check rejected. Could be that gatekeeper settings only accept App Store apps." ERROR + fi fi cleanupAndExit 4 "Error verifying $appPath error:\n$logoutput" ERROR fi @@ -582,7 +586,11 @@ installFromPKG() { if [[ $spctlStatus -ne 0 ]] ; then #if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then if [[ "$(echo $spctlOut | head -1 | grep -oi rejected)" = "rejected" ]]; then - printlog "Gatekeeper check rejected. Could be that gatekeeper settings only accept App Store apps." ERROR + if [[ "$(echo $spctlOut | tail -1)" = "source=no usable signature" ]]; then + printlog "Gatekeeper check rejected. No usable signature." ERROR + else + printlog "Gatekeeper check rejected. Could be that gatekeeper settings only accept App Store apps." ERROR + fi fi cleanupAndExit 4 "Error verifying $archiveName error:\n$logoutput" ERROR fi