X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Ftemplate.sh;h=643be6ccaa1852fe81312b45857c4aecfdd83327;hb=7068584ef56fb51bb39c18d5afeb0d31b7bac757;hp=7a16ae275819eaf3c3f0e75c8ec377489fffeecc;hpb=ef49c0287cc890f1394ddbbb192e9a98c0a53759;p=webi-installers%2F.git

diff --git a/_webi/template.sh b/_webi/template.sh
index 7a16ae2..643be6c 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-{
+function __bootstrap_webi() {
 
 set -e
 set -u
 #set -x
 
 #WEBI_PKG=
-#WEBI_NAME=
+#PKG_NAME=
 # TODO should this be BASEURL instead?
+#WEBI_OS=
+#WEBI_ARCH=
 #WEBI_HOST=
 #WEBI_RELEASES=
 #WEBI_CSV=
@@ -25,6 +27,9 @@ set -u
 #WEBI_FORMATS=
 #WEBI_PKG_URL=
 #WEBI_PKG_FILE=
+#PKG_OSES=
+#PKG_ARCHES=
+#PKG_FORMATS=
 WEBI_UA="$(uname -a)"
 export WEBI_HOST
 
@@ -33,6 +38,7 @@ export WEBI_HOST
 ##
 
 WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-${WEBI_PKG:-}.XXXXXXXX)"}
+export _webi_tmp="${_webi_tmp:-"$HOME/.local/opt/webi-tmp.d"}"
 
 mkdir -p "$HOME/Downloads"
 mkdir -p "$HOME/.local/bin"
@@ -72,22 +78,12 @@ webi_link() {
     fi
 
     if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
-        if [ -L "$pkg_dst_cmd" ]; then
-            rm -f "$pkg_dst_cmd"
-        elif [ -e "$pkg_dst_cmd" ]; then
-            echo "remove $pkg_dst_cmd?"
-            rm -rf -i "$pkg_dst_cmd"
-        fi
+        rm -rf "$pkg_dst_cmd"
         ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
     else
-        # 'pkg_dst' will default to $HOME/.local/opt/node
-        # 'pkg_src' will be the installed version, such as to $HOME/.local/opt/node-v12.8.0
-        if [ -L "$pkg_dst" ]; then
-            rm -f "$pkg_dst"
-        elif [ -e "$pkg_dst" ]; then
-            echo "remove $pkg_dst?"
-            rm -rf -i "$pkg_dst"
-        fi
+        # 'pkg_dst' will default to $HOME/.local/opt/<pkg>
+        # 'pkg_src' will be the installed version, such as to $HOME/.local/opt/<pkg>-<version>
+        rm -rf "$pkg_dst"
         ln -s "$pkg_src" "$pkg_dst"
     fi
 }
@@ -96,6 +92,8 @@ webi_link() {
 webi_check() {
     # Test for existing version
     set +e
+    my_path="$PATH"
+    export PATH="$(dirname "$pkg_dst_cmd"):$PATH"
     my_current_cmd="$(command -v "$pkg_cmd_name")"
     set -e
     if [ -n "$my_current_cmd" ]; then
@@ -109,7 +107,7 @@ webi_check() {
             exit 0
         else
             if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
-                echo "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd"
+                >&2 echo "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd"
             fi
             if [ -x "$pkg_src_cmd" ]; then
                 webi_link
@@ -118,6 +116,7 @@ webi_check() {
             fi
           fi
     fi
+    export PATH="$my_path"
 }
 
 # detect if file is downloaded, and how to download it
@@ -127,14 +126,12 @@ webi_download() {
     else
         if [ "error" == "$WEBI_CHANNEL" ]; then
             # TODO pass back requested OS / Arch / Version
-            echo "Error: no '$WEBI_NAME' release found for the given OS and architecture by that tag or version"
-            echo "       (check that the package name and version are correct)"
-            echo "See $WEBI_RELEASES"
-            echo "        WEBI_PKG=$WEBI_PKG"
-            echo "        WEBI_NAME=$WEBI_NAME"
-            echo "        WEBI_VERSION=$WEBI_VERSION"
-            echo "        WEBI_EXT=$WEBI_EXT"
-            echo "        WEBI_FORMATS=$WEBI_FORMATS"
+            >&2 echo "Error: no '$PKG_NAME' release for '$WEBI_OS' on '$WEBI_ARCH' as one of '$WEBI_FORMATS' by the tag '$WEBI_TAG'"
+            >&2 echo "       '$PKG_NAME' is available for '$PKG_OSES' on '$PKG_ARCHES' as one of '$PKG_FORMATS'"
+            >&2 echo "       (check that the package name and version are correct)"
+            >&2 echo ""
+            >&2 echo "       Double check at $(echo "$WEBI_RELEASES" | sed 's:\?.*::')"
+            >&2 echo ""
             exit 1
         fi
         my_url="$WEBI_PKG_URL"
@@ -150,7 +147,8 @@ webi_download() {
         return 0
     fi
 
-    echo "Downloading $WEBI_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...
@@ -158,19 +156,29 @@ webi_download() {
         # wget has resumable downloads
         # TODO wget -c --content-disposition "$my_url"
         set +e
-        wget -q --show-progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"
+        my_show_progress=""
+        if [[ $- == *i* ]]; then
+          my_show_progress="--show-progress"
+        fi
+        wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"
         if ! [ $? -eq 0 ]; then
-          echo "failed to download from $WEBI_PKG_URL"
+          >&2 echo "failed to download from $WEBI_PKG_URL"
           exit 1
         fi
         set -e
     else
         # Neither GNU nor BSD curl have sane resume download options, hence we don't bother
         # 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"
+        my_show_progress="-#"
+        if [[ $- == *i* ]]; then
+          my_show_progress=""
+        fi
+        curl -fSL $my_show_progress -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
@@ -181,10 +189,10 @@ webi_extract() {
             tar xf "$HOME/Downloads/$WEBI_PKG_FILE"
         elif [ "zip" == "$WEBI_EXT" ]; then
             echo "Extracting $HOME/Downloads/$WEBI_PKG_FILE"
-            unzip "$HOME/Downloads/$WEBI_PKG_FILE"
+            unzip "$HOME/Downloads/$WEBI_PKG_FILE" > __unzip__.log
         elif [ "exe" == "$WEBI_EXT" ]; then
-            # do nothing (but don't leave an empty if block either)
-            echo -n ""
+            echo "Moving $HOME/Downloads/$WEBI_PKG_FILE"
+            mv "$HOME/Downloads/$WEBI_PKG_FILE" .
         elif [ "xz" == "$WEBI_EXT" ]; then
             echo "Inflating $HOME/Downloads/$WEBI_PKG_FILE"
             unxz -c "$HOME/Downloads/$WEBI_PKG_FILE" > $(basename "$WEBI_PKG_FILE")
@@ -201,19 +209,18 @@ webi_path_add() {
     # make sure that we don't recursively install pathman with webi
     my_path="$PATH"
     export PATH="$HOME/.local/bin:$PATH"
-    set +e
-    my_pathman=$(command -v pathman)
-    set -e
-    export PATH="$my_path"
 
     # install pathman if not already installed
-    if [ -z "$my_pathman" ]; then
-        "$HOME/.local/bin/webi" pathman
-        export PATH="$HOME/.local/bin:$PATH"
+    if [ -z "$(command -v pathman)" ]; then
+        "$HOME/.local/bin/webi" pathman > /dev/null
     fi
 
+    export PATH="$my_path"
+
     # in case pathman was recently installed and the PATH not updated
-    "$HOME/.local/bin/pathman" add "$1"
+    mkdir -p "$_webi_tmp"
+    # prevent "too few arguments" output on bash when there are 0 lines of stdout
+    "$HOME/.local/bin/pathman" add "$1" | grep "export" 2>/dev/null >> "$_webi_tmp/.PATH.env" || true
 }
 
 # group common pre-install tasks as default
@@ -228,22 +235,42 @@ webi_install() {
     if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
         mkdir -p "$(dirname $pkg_src_cmd)"
         mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
-        chmod a+x "$pkg_src_cmd"
     else
-        mkdir -p "$(dirname $pkg_src)"
-        if [ -L "$pkg_src" ]; then
-            rm -f "$pkg_src"
-        elif [ -e "$pkg_src" ]; then
-            echo "remove $pkg_src?"
-            rm -rf -i "$pkg_src"
-        fi
+        rm -rf "$pkg_src"
         mv ./"$pkg_cmd_name"* "$pkg_src"
     fi
 }
 
 # run post-install functions - just updating PATH by default
 webi_post_install() {
-    webi_path_add "$pkg_dst_bin"
+    webi_path_add "$(dirname "$pkg_dst_cmd")"
+}
+
+_webi_enable_exec() {
+    if [ -n "$(command -v spctl)" ] && [ -n "$(command -v xattr)" ] ; then
+        # note: some packages contain files that cannot be affected by xattr
+        xattr -r -d com.apple.quarantine "$pkg_src" || true
+        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 ""
+            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
 }
 
 # a friendly message when all is well, showing the final install path in $HOME/.local
@@ -259,12 +286,20 @@ _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 ""
+
+function __init_installer() {
 
 {{ installer }}
 
 }
 
+__init_installer
+
 ##
 ##
 ## END custom override functions
@@ -273,35 +308,37 @@ WEBI_SINGLE=
 
 # run everything with defaults or overrides as needed
 if [ -n "$(command -v pkg_get_current_version)" ]; then
-    pkg_cmd_name="${pkg_cmd_name:-$WEBI_NAME}"
+    pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
 
     if [ -n "$WEBI_SINGLE" ]; then
         pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
-        pkg_dst_bin="$(dirname $pkg_dst_cmd)"
-        pkg_dst="$(dirname $pkg_dst_bin)"
+        pkg_dst="$pkg_dst_cmd" # "$(dirname "$(dirname $pkg_dst_cmd)")"
 
-        pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/xbin/$pkg_cmd_name-$WEBI_VERSION}"
-        pkg_src_bin="$(dirname $pkg_src_cmd)"
-        pkg_src="$(dirname $pkg_src_bin)"
+        #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}"
-        pkg_dst_bin="${pkg_dst_bin:-$pkg_dst/bin}"
-        pkg_dst_cmd="${pkg_dst_cmd:-$pkg_dst_bin/$pkg_cmd_name}"
+        pkg_dst_cmd="${pkg_dst_cmd:-$pkg_dst/bin/$pkg_cmd_name}"
 
         pkg_src="${pkg_src:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION}"
-        pkg_src_bin="${pkg_src_bin:-$pkg_src/bin}"
-        pkg_src_cmd="${pkg_src_cmd:-$pkg_src_bin/$pkg_cmd_name}"
+        pkg_src_cmd="${pkg_src_cmd:-$pkg_src/bin/$pkg_cmd_name}"
     fi
+    pkg_src_bin="$(dirname "$pkg_src_cmd")"
+    pkg_dst_bin="$(dirname "$pkg_dst_cmd")"
 
     [ -n "$(command -v pkg_pre_install)" ] && pkg_pre_install || webi_pre_install
 
     pushd "$WEBI_TMP" 2>&1 >/dev/null
         echo "Installing to $pkg_src_cmd"
         [ -n "$(command -v pkg_install)" ] && pkg_install || webi_install
+        chmod a+x "$pkg_src"
+        chmod a+x "$pkg_src_cmd"
     popd 2>&1 >/dev/null
 
     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
@@ -313,9 +350,19 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then
     echo ""
 fi
 
+webi_path_add "$HOME/.local/bin"
+if [ -z "${_WEBI_CHILD:-}" ] && [ -f "\$_webi_tmp/.PATH.env" ]; then
+    echo "You need to update your PATH to use $PKG_NAME:"
+    echo ""
+    cat "$_webi_tmp/.PATH.env" | sort -u
+    rm -f "$_webi_tmp/.PATH.env"
+fi
+
 # cleanup the temp directory
 rm -rf "$WEBI_TMP"
 
 # See? No magic. Just downloading and moving files.
 
 }
+
+__bootstrap_webi