X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Ftemplate.sh;h=1823945d5d2763da4fc553d5bf376920bd8ab2cc;hb=46445e9382905a52e770d44191235be179616049;hp=643be6ccaa1852fe81312b45857c4aecfdd83327;hpb=76776e9d5403d59b2cd5cba16d84f819a56bc5aa;p=webi-installers%2F.git

diff --git a/_webi/template.sh b/_webi/template.sh
index 643be6c..1823945 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -2,188 +2,187 @@
 
 function __bootstrap_webi() {
 
-set -e
-set -u
-#set -x
-
-#WEBI_PKG=
-#PKG_NAME=
-# TODO should this be BASEURL instead?
-#WEBI_OS=
-#WEBI_ARCH=
-#WEBI_HOST=
-#WEBI_RELEASES=
-#WEBI_CSV=
-#WEBI_TAG=
-#WEBI_VERSION=
-#WEBI_MAJOR=
-#WEBI_MINOR=
-#WEBI_PATCH=
-# TODO not sure if BUILD is the best name for this
-#WEBI_BUILD=
-#WEBI_LTS=
-#WEBI_CHANNEL=
-#WEBI_EXT=
-#WEBI_FORMATS=
-#WEBI_PKG_URL=
-#WEBI_PKG_FILE=
-#PKG_OSES=
-#PKG_ARCHES=
-#PKG_FORMATS=
-WEBI_UA="$(uname -a)"
-export WEBI_HOST
-
-##
-## Set up tmp, download, and install directories
-##
-
-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"
-mkdir -p "$HOME/.local/opt"
-
-##
-## Detect http client
-##
-set +e
-export WEBI_CURL="$(command -v curl)"
-export WEBI_WGET="$(command -v wget)"
-set -e
-
-
-# get the special formatted version (i.e. "go is go1.14" while node is "node v12.10.8")
-my_versioned_name=""
-_webi_canonical_name() {
-    if [ -n "$my_versioned_name" ]; then
-        echo "$my_versioned_name"
-        return 0
-    fi
+    set -e
+    set -u
+    #set -x
+
+    #WEBI_PKG=
+    #PKG_NAME=
+    # TODO should this be BASEURL instead?
+    #WEBI_OS=
+    #WEBI_ARCH=
+    #WEBI_HOST=
+    #WEBI_RELEASES=
+    #WEBI_CSV=
+    #WEBI_TAG=
+    #WEBI_VERSION=
+    #WEBI_MAJOR=
+    #WEBI_MINOR=
+    #WEBI_PATCH=
+    # TODO not sure if BUILD is the best name for this
+    #WEBI_BUILD=
+    #WEBI_LTS=
+    #WEBI_CHANNEL=
+    #WEBI_EXT=
+    #WEBI_FORMATS=
+    #WEBI_PKG_URL=
+    #WEBI_PKG_FILE=
+    #PKG_OSES=
+    #PKG_ARCHES=
+    #PKG_FORMATS=
+    WEBI_UA="$(uname -a)"
+    export WEBI_HOST
+
+    ##
+    ## Set up tmp, download, and install directories
+    ##
+
+    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"
+    mkdir -p "$HOME/.local/opt"
+
+    ##
+    ## Detect http client
+    ##
+    set +e
+    export WEBI_CURL="$(command -v curl)"
+    export WEBI_WGET="$(command -v wget)"
+    set -e
 
-    if [ -n "$(command -v pkg_format_cmd_version)" ]; then
-        my_versioned_name="$(pkg_format_cmd_version "$WEBI_VERSION")"
-    else
-        my_versioned_name="'$pkg_cmd_name' v$WEBI_VERSION"
-    fi
+    # get the special formatted version (i.e. "go is go1.14" while node is "node v12.10.8")
+    my_versioned_name=""
+    _webi_canonical_name() {
+        if [ -n "$my_versioned_name" ]; then
+            echo "$my_versioned_name"
+            return 0
+        fi
 
-    echo "$my_versioned_name"
-}
+        if [ -n "$(command -v pkg_format_cmd_version)" ]; then
+            my_versioned_name="$(pkg_format_cmd_version "$WEBI_VERSION")"
+        else
+            my_versioned_name="'$pkg_cmd_name' v$WEBI_VERSION"
+        fi
 
-# update symlinks according to $HOME/.local/opt and $HOME/.local/bin install paths.
-webi_link() {
-    if [ -n "$(command -v pkg_link)" ]; then
-        pkg_link
-        return 0
-    fi
+        echo "$my_versioned_name"
+    }
 
-    if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
-        rm -rf "$pkg_dst_cmd"
-        ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
-    else
-        # '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
-}
+    # update symlinks according to $HOME/.local/opt and $HOME/.local/bin install paths.
+    webi_link() {
+        if [ -n "$(command -v pkg_link)" ]; then
+            pkg_link
+            return 0
+        fi
 
-# detect if this program is already installed or if an installed version may cause conflict
-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
-        pkg_current_version="$(pkg_get_current_version 2>/dev/null | head -n 1)"
-        # remove trailing '.0's for golang's sake
-        my_current_version="$(echo $pkg_current_version | sed 's:\.0::g')"
-        my_src_version="$(echo $WEBI_VERSION | sed 's:\.0::g')"
-        my_canonical_name="$(_webi_canonical_name)"
-        if [ "$my_src_version" == "$my_current_version" ]; then
-            echo "$my_canonical_name already installed at $my_current_cmd"
-            exit 0
+        if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
+            rm -rf "$pkg_dst_cmd"
+            ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
         else
-            if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
-                >&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
-                echo "switched to $my_canonical_name at $pkg_src"
+            # '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
+    }
+
+    # detect if this program is already installed or if an installed version may cause conflict
+    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
+            pkg_current_version="$(pkg_get_current_version 2> /dev/null | head -n 1)"
+            # remove trailing '.0's for golang's sake
+            my_current_version="$(echo $pkg_current_version | sed 's:\.0::g')"
+            my_src_version="$(echo $WEBI_VERSION | sed 's:\.0::g')"
+            my_canonical_name="$(_webi_canonical_name)"
+            if [ "$my_src_version" == "$my_current_version" ]; then
+                echo "$my_canonical_name already installed at $my_current_cmd"
                 exit 0
+            else
+                if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
+                    echo >&2 "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd"
+                fi
+                if [ -x "$pkg_src_cmd" ]; then
+                    webi_link
+                    echo "switched to $my_canonical_name at $pkg_src"
+                    exit 0
+                fi
             fi
-          fi
-    fi
-    export PATH="$my_path"
-}
-
-# detect if file is downloaded, and how to download it
-webi_download() {
-    if [ -n "${1:-}" ]; then
-        my_url="$1"
-    else
-        if [ "error" == "$WEBI_CHANNEL" ]; then
-            # TODO pass back requested OS / Arch / Version
-            >&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"
-    fi
-    if [ -n "${2:-}" ]; then
-        my_dl="$2"
-    else
-        my_dl="$HOME/Downloads/$WEBI_PKG_FILE"
-    fi
-
-    if [ -e "$my_dl" ]; then
-        echo "Found $my_dl"
-        return 0
-    fi
-
-    echo "Downloading $PKG_NAME from"
-    echo "$my_url"
+        export PATH="$my_path"
+    }
 
-    # 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...
-    if [ -n "$WEBI_WGET" ]; then
-        # wget has resumable downloads
-        # TODO wget -c --content-disposition "$my_url"
-        set +e
-        my_show_progress=""
-        if [[ $- == *i* ]]; then
-          my_show_progress="--show-progress"
+    # detect if file is downloaded, and how to download it
+    webi_download() {
+        if [ -n "${1:-}" ]; then
+            my_url="$1"
+        else
+            if [ "error" == "$WEBI_CHANNEL" ]; then
+                # TODO pass back requested OS / Arch / Version
+                echo >&2 "Error: no '$PKG_NAME' release for '$WEBI_OS' on '$WEBI_ARCH' as one of '$WEBI_FORMATS' by the tag '$WEBI_TAG'"
+                echo >&2 "       '$PKG_NAME' is available for '$PKG_OSES' on '$PKG_ARCHES' as one of '$PKG_FORMATS'"
+                echo >&2 "       (check that the package name and version are correct)"
+                echo >&2 ""
+                echo >&2 "       Double check at $(echo "$WEBI_RELEASES" | sed 's:\?.*::')"
+                echo >&2 ""
+                exit 1
+            fi
+            my_url="$WEBI_PKG_URL"
         fi
-        wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"
-        if ! [ $? -eq 0 ]; then
-          >&2 echo "failed to download from $WEBI_PKG_URL"
-          exit 1
+        if [ -n "${2:-}" ]; then
+            my_dl="$2"
+        else
+            my_dl="$HOME/Downloads/$WEBI_PKG_FILE"
         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"
-        my_show_progress="-#"
-        if [[ $- == *i* ]]; then
-          my_show_progress=""
+
+        if [ -e "$my_dl" ]; then
+            echo "Found $my_dl"
+            return 0
         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"
-}
+        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...
+        if [ -n "$WEBI_WGET" ]; then
+            # wget has resumable downloads
+            # TODO wget -c --content-disposition "$my_url"
+            set +e
+            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 >&2 "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"
+            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
-webi_extract() {
-    pushd "$WEBI_TMP" 2>&1 >/dev/null
+    # detect which archives can be used
+    webi_extract() {
+        pushd "$WEBI_TMP" 2>&1 > /dev/null
         if [ "tar" == "$WEBI_EXT" ]; then
             echo "Extracting $HOME/Downloads/$WEBI_PKG_FILE"
             tar xf "$HOME/Downloads/$WEBI_PKG_FILE"
@@ -201,167 +200,167 @@ webi_extract() {
             echo "Failed to extract $HOME/Downloads/$WEBI_PKG_FILE"
             exit 1
         fi
-    popd 2>&1 >/dev/null
-}
-
-# use 'pathman' to update $HOME/.config/envman/PATH.env
-webi_path_add() {
-    # make sure that we don't recursively install pathman with webi
-    my_path="$PATH"
-    export PATH="$HOME/.local/bin:$PATH"
-
-    # install pathman if not already installed
-    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
-    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
-webi_pre_install() {
-    webi_check
-    webi_download
-    webi_extract
-}
-
-# move commands from the extracted archive directory to $HOME/.local/opt or $HOME/.local/bin
-webi_install() {
-    if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
-        mkdir -p "$(dirname $pkg_src_cmd)"
-        mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
-    else
-        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 "$(dirname "$pkg_dst_cmd")"
-}
+        popd 2>&1 > /dev/null
+    }
+
+    # use 'pathman' to update $HOME/.config/envman/PATH.env
+    webi_path_add() {
+        # make sure that we don't recursively install pathman with webi
+        my_path="$PATH"
+        export PATH="$HOME/.local/bin:$PATH"
+
+        # install pathman if not already installed
+        if [ -z "$(command -v pathman)" ]; then
+            "$HOME/.local/bin/webi" pathman > /dev/null
+        fi
 
-_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"
+        export PATH="$my_path"
+
+        # in case pathman was recently installed and the PATH not updated
+        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
+    webi_pre_install() {
+        webi_check
+        webi_download
+        webi_extract
+    }
+
+    # move commands from the extracted archive directory to $HOME/.local/opt or $HOME/.local/bin
+    webi_install() {
+        if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
+            mkdir -p "$(dirname $pkg_src_cmd)"
+            mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
+        else
+            rm -rf "$pkg_src"
+            mv ./"$pkg_cmd_name"* "$pkg_src"
         fi
-    fi
-}
+    }
+
+    # run post-install functions - just updating PATH by default
+    webi_post_install() {
+        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
-_webi_done_message() {
-    echo "Installed $(_webi_canonical_name) as $pkg_dst_cmd"
-}
+    # a friendly message when all is well, showing the final install path in $HOME/.local
+    _webi_done_message() {
+        echo "Installed $(_webi_canonical_name) as $pkg_dst_cmd"
+    }
 
-##
-##
-## BEGIN custom override functions from <package>/install.sh
-##
-##
+    ##
+    ##
+    ## BEGIN custom override functions from <package>/install.sh
+    ##
+    ##
 
-WEBI_SINGLE=
+    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 ""
+    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() {
+    function __init_installer() {
 
-{{ installer }}
+        {{ installer }}
 
-}
+    }
 
-__init_installer
+    __init_installer
 
-##
-##
-## END custom override functions
-##
-##
+    ##
+    ##
+    ## END custom override functions
+    ##
+    ##
 
-# run everything with defaults or overrides as needed
-if [ -n "$(command -v pkg_get_current_version)" ]; then
-    pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
+    # run everything with defaults or overrides as needed
+    if [ -n "$(command -v pkg_get_current_version)" ]; then
+        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="$pkg_dst_cmd" # "$(dirname "$(dirname $pkg_dst_cmd)")"
+        if [ -n "$WEBI_SINGLE" ]; 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/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_cmd="${pkg_dst_cmd:-$pkg_dst/bin/$pkg_cmd_name}"
+            #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_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_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")"
+            pkg_src="${pkg_src:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION}"
+            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
+        [ -n "$(command -v pkg_pre_install)" ] && pkg_pre_install || webi_pre_install
 
-    pushd "$WEBI_TMP" 2>&1 >/dev/null
+        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
+        popd 2>&1 > /dev/null
 
-    webi_link
+        webi_link
 
-    _webi_enable_exec
-    pushd "$WEBI_TMP" 2>&1 >/dev/null
+        _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
+        popd 2>&1 > /dev/null
 
-    pushd "$WEBI_TMP" 2>&1 >/dev/null
+        pushd "$WEBI_TMP" 2>&1 > /dev/null
         [ -n "$(command -v pkg_done_message)" ] && pkg_done_message || _webi_done_message
-    popd 2>&1 >/dev/null
+        popd 2>&1 > /dev/null
 
-    echo ""
-fi
+        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
+    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"
+    # cleanup the temp directory
+    rm -rf "$WEBI_TMP"
 
-# See? No magic. Just downloading and moving files.
+    # See? No magic. Just downloading and moving files.
 
 }