X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;ds=sidebyside;f=_webi%2Ftemplate.sh;h=274bfa17d01fc107a625e1b296d7cf7003c91f2f;hb=b228d1253c286b85f484f1fa3c6bf533fd3e0a16;hp=fc7629a27fec5bf2b4543f1614bd94d46e504975;hpb=e7ebf863365d9f6e64237d98738e1b0b52cab38f;p=webi-installers%2F.git

diff --git a/_webi/template.sh b/_webi/template.sh
index fc7629a..274bfa1 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -239,6 +239,12 @@ webi_post_install() {
 }
 
 _webi_enable_exec() {
+    if [ -n "$(command -v spctl)" ] && [ -n "$(command -v xattr)" ] ; then
+        xattr -r -d com.apple.quarantine "$pkg_src"
+        return 0
+    fi
+    # TODO need to test that the above actually worked
+    # (and proceed to this below if it did not)
     if [ -n "$(command -v spctl)" ]; then
         echo "Checking permission to execute '$pkg_cmd_name' on macOS 11+"
         set +e
@@ -319,10 +325,10 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then
 
     webi_link
 
+    _webi_enable_exec
     pushd "$WEBI_TMP" 2>&1 >/dev/null
         [ -n "$(command -v pkg_post_install)" ] && pkg_post_install || webi_post_install
     popd 2>&1 >/dev/null
-    _webi_enable_exec
 
     pushd "$WEBI_TMP" 2>&1 >/dev/null
         [ -n "$(command -v pkg_done_message)" ] && pkg_done_message || _webi_done_message