Updated gitignore with changes in #97

[webi-installers/.git] / _webi / template.sh

diff --git a/_webi/template.sh b/_webi/template.sh
index 4a2e7500d6a17f77436396da847008710a076495..274bfa17d01fc107a625e1b296d7cf7003c91f2f 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -147,7 +147,8 @@ webi_download() {
         return 0
     fi
 
-    echo "Downloading $PKG_NAME to $my_dl"
+    echo "Downloading $PKG_NAME from"
+    echo "$my_url"
 
     # It's only 2020, we can't expect to have reliable CLI tools
     # to tell us the size of a file as part of a base system...
@@ -166,8 +167,10 @@ webi_download() {
         # TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url"
         curl -fSL -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part"
     fi
-
     mv "$my_dl.part" "$my_dl"
+
+    echo ""
+    echo "Saved as $my_dl"
 }
 
 # detect which archives can be used
@@ -236,14 +239,26 @@ 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
         is_allowed="$(spctl -a "$pkg_src_cmd" 2>&1 | grep valid)"
         set -e
         if [ -z "$is_allowed" ]; then
-            echo "Requesting permission to execute '$pkg_cmd_name' on Catalina and macOS 11+"
-            sleep 1
+            echo ""
+            echo "##########################################"
+            echo "#  IMPORTANT: Permission Grant Required  #"
+            echo "##########################################"
+            echo ""
+            echo "Requesting permission to execute '$pkg_cmd_name' on macOS 10.14+"
+            echo ""
+            sleep 3
             spctl --add "$pkg_src_cmd"
         fi
     fi
@@ -262,6 +277,12 @@ _webi_done_message() {
 
 WEBI_SINGLE=
 
+echo ""
+echo "Thanks for using webi to install '$PKG_NAME' on '$WEBI_OS/$WEBI_ARCH'."
+echo "Have a problem? Experience a bug? Please let us know:"
+echo "        https://github.com/webinstall/packages/issues"
+echo ""
+
 {
 
 {{ installer }}
@@ -282,7 +303,8 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then
         pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
         pkg_dst="$pkg_dst_cmd" # "$(dirname "$(dirname $pkg_dst_cmd)")"
 
-        pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/xbin/$pkg_cmd_name-v$WEBI_VERSION}"
+        #pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name-v$WEBI_VERSION}"
+        pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name}"
         pkg_src="$pkg_src_cmd" # "$(dirname "$(dirname $pkg_src_cmd)")"
     else
         pkg_dst="${pkg_dst:-$HOME/.local/opt/$pkg_cmd_name}"
@@ -303,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