f: neovim

_webi/bootstrap.ps1

@@ -7,6 +7,6 @@
 New-Item -Path "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
 New-Item -Path "$Env:USERPROFILE\.local\bin" -ItemType Directory -Force | Out-Null
 IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
-curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/webi/webi-pwsh.ps1" -o "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1"
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi-pwsh.ps1" -o "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1"
 Set-ExecutionPolicy -Scope Process Bypass
 & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" "{{ exename }}"

_webi/bootstrap.sh

@@ -0,0 +1,346 @@
+#!/bin/sh
+#<pre>
+
+############################################################
+# <h1>Cheat Sheet at CHEATSHEET_URL</h1>
+# <meta http-equiv="refresh" content="3; URL='CHEATSHEET_URL'" />
+############################################################
+
+#set -x
+
+__install_webi() {
+
+    #WEBI_PKG=
+    #WEBI_HOST=https://webinstall.dev
+    export WEBI_HOST
+
+    if test -z "$WEBI_WELCOME"; then
+        echo ""
+        printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s/%s\e[0m'.\n" "${WEBI_PKG-}" "$(uname -s)/$(uname -r)" "$(uname -m)"
+        echo "Have a problem? Experience a bug? Please let us know:"
+        printf "        \e[2m\e[36mhttps://github.com/webinstall/webi-installers/issues\e[0m\n"
+        echo ""
+        printf "\e[35mLovin'\e[0m it? Say thanks with a \e[1m\e[33mStar on GitHub\e[0m:\n"
+        printf "        \e[36mhttps://github.com/webinstall/webi-installers\e[0m\n"
+        echo ""
+    fi
+
+    WEBI_WELCOME=true
+    export WEBI_WELCOME
+
+    set -e
+    set -u
+
+    mkdir -p "$HOME/.local/bin"
+
+    cat << EOF > "$HOME/.local/bin/webi"
+#!/bin/sh
+
+set -e
+set -u
+#set -x
+
+__webi_main() {
+
+    my_date="\$(date +%F_%H-%M-%S)"
+    export WEBI_TIMESTAMP="\${my_date}"
+    export _webi_tmp="\${_webi_tmp:-\$(
+        mktemp -d -t "webi-\$WEBI_TIMESTAMP.XXXXXXXX"
+    )}"
+
+    if [ -n "\${_WEBI_PARENT:-}" ]; then
+        export _WEBI_CHILD=true
+    else
+        export _WEBI_CHILD=
+    fi
+    export _WEBI_PARENT=true
+
+    my_os="\$(uname -s)"
+    my_arch="\$(uname -m)"
+
+    ##
+    ## Detect acceptable package formats
+    ##
+
+    my_ext=""
+    set +e
+    # NOTE: the order here is least favorable to most favorable
+    if [ -n "\$(command -v pkgutil)" ]; then
+        my_ext="pkg,\$my_ext"
+    fi
+    # disable this check for the sake of building the macOS installer on Linux
+    #if [ -n "\$(command -v diskutil)" ]; then
+        # note: could also detect via hdiutil
+        my_ext="dmg,\$my_ext"
+    #fi
+    if [ -n "\$(command -v git)" ]; then
+        my_ext="git,\$my_ext"
+    fi
+    if [ -n "\$(command -v unxz)" ]; then
+        my_ext="xz,\$my_ext"
+    fi
+    if [ -n "\$(command -v unzip)" ]; then
+        my_ext="zip,\$my_ext"
+    fi
+    # for mac/linux 'exe' refers to the uncompressed binary without extension
+    my_ext="exe,\$my_ext"
+    if [ -n "\$(command -v tar)" ]; then
+        my_ext="tar,\$my_ext"
+    fi
+    my_ext="\$(echo "\$my_ext" | sed 's/,$//')" # nix trailing comma
+    set -e
+
+
+    ##
+    ## Detect http client
+    ##
+
+    set +e
+    WEBI_CURL="\$(command -v curl)"
+    export WEBI_URL
+    WEBI_WGET="\$(command -v wget)"
+    export WEBI_WGET
+    set -e
+
+    my_libc=''
+    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
+        my_libc=' musl-native'
+    fi
+
+    export WEBI_HOST="\${WEBI_HOST:-https://webinstall.dev}"
+
+    # ex: Darwin or Linux
+    my_sys="\$(uname -s)"
+    # ex: 22.6.0
+    my_rev="\$(uname -r)"
+    # ex: arm64
+    my_machine="\$(uname -m)"
+
+    export WEBI_UA="\${my_sys}/\${my_rev} \${my_machine}/unknown \${my_libc}"
+
+    webinstall() {
+
+        my_package="\${1:-}"
+        if [ -z "\$my_package" ]; then
+            echo >&2 "Usage: webi <package>@<version> ..."
+            echo >&2 "Example: webi node@lts rg"
+            exit 1
+        fi
+
+        WEBI_BOOT="\$(
+            mktemp -d -t "\$my_package-bootstrap.\$WEBI_TIMESTAMP.XXXXXXXX"
+        )"
+        export WEBI_BOOT
+
+        my_installer_url="\$WEBI_HOST/api/installers/\$my_package.sh?formats=\$my_ext"
+        if [ -n "\$WEBI_CURL" ]; then
+            if !  curl -fsSL "\$my_installer_url" -H "User-Agent: curl \$WEBI_UA" \\
+                -o "\$WEBI_BOOT/\$my_package-bootstrap.sh"; then
+                echo >&2 "error fetching '\$my_installer_url'"
+                exit 1
+            fi
+        else
+            if !  wget -q "\$my_installer_url" --user-agent="wget \$WEBI_UA" \\
+                -O "\$WEBI_BOOT/\$my_package-bootstrap.sh"; then
+                echo >&2 "error fetching '\$my_installer_url'"
+                exit 1
+            fi
+        fi
+
+        (
+            cd "\$WEBI_BOOT"
+            sh "\$my_package-bootstrap.sh"
+        )
+
+        rm -rf "\$WEBI_BOOT"
+
+    }
+
+    show_path_updates() {
+
+        if test -z "\${_WEBI_CHILD}"; then
+            if test -f "\$_webi_tmp/.PATH.env"; then
+                my_paths=\$(sort -u < "\$_webi_tmp/.PATH.env")
+                if test -n "\$my_paths"; then
+                    printf 'PATH.env updated with:\\n'
+                    printf "%s\\n" "\$my_paths"
+                    printf '\\n'
+                    printf "\\e[1m\\e[35mTO FINISH\\e[0m: copy, paste & run the following command:\\n"
+                    printf "\\n"
+                    printf "        \\e[1m\\e[32msource ~/.config/envman/PATH.env\\e[0m\\n"
+                    printf "        (newly opened terminal windows will update automatically)\\n"
+                fi
+                rm -f "\$_webi_tmp/.PATH.env"
+            fi
+        fi
+
+    }
+
+    fn_checksum() {
+        cmd_shasum='sha1sum'
+        if command -v shasum > /dev/null; then
+            cmd_shasum='shasum'
+        fi
+        \$cmd_shasum "\${0}" | cut -d' ' -f1 | cut -c 1-8
+    }
+
+    version() {
+        my_checksum="\$(
+            fn_checksum
+        )"
+        my_version=v1.2.0
+        printf "\\e[35mwebi\\e[32m %s\\e[0m Copyright 2020+ AJ ONeal\\n" "\${my_version} (\${my_checksum})"
+        printf "    \\e[36mhttps://webinstall.dev/webi\\e[0m\\n"
+    }
+
+    # show help if no params given or help flags are used
+    usage() {
+        echo ""
+        version
+        echo ""
+
+        printf "\\e[1mSUMMARY\\e[0m\\n"
+        echo "    Webi is the best way to install the modern developer tools you love."
+        echo "    It's fast, easy-to-remember, and conflict free."
+        echo ""
+        printf "\\e[1mUSAGE\\e[0m\\n"
+        echo "    webi <thing1>[@version] [thing2] ..."
+        echo ""
+        printf "\\e[1mUNINSTALL\\e[0m\\n"
+        echo "    Almost everything that is installed with webi is scoped to"
+        echo "    ~/.local/opt/<thing1>, so you can remove it like so:"
+        echo ""
+        echo "    rm -rf ~/.local/opt/<thing1>"
+        echo "    rm -f ~/.local/bin/<thing1>"
+        echo ""
+        echo "    Some packages have special uninstall instructions, check"
+        echo "    https://webinstall.dev/<thing1> to be sure."
+        echo ""
+        printf "\\e[1mOPTIONS\\e[0m\\n"
+        echo "    Generic Program Information"
+        echo "        --help Output a usage message and exit."
+        echo ""
+        echo "        -V, --version"
+        echo "               Output the version number of webi and exit."
+        echo ""
+        echo "    Helper Utilities"
+        echo "        --list Show everything webi has to offer."
+        echo ""
+        echo "        --info <package>"
+        echo "               Show various links and example release."
+        echo ""
+        printf "\\e[1mFAQ\\e[0m\\n"
+        printf "    See \\e[34mhttps://webinstall.dev/faq\\e[0m\\n"
+        echo ""
+        printf "\\e[1mALWAYS REMEMBER\\e[0m\\n"
+        echo "    Friends don't let friends use brew for simple, modern tools that don't need it."
+        echo "    (and certainly not apt either **shudder**)"
+        echo ""
+    }
+
+    if [ \$# -eq 0 ] || echo "\$1" | grep -q -E '^(-V|--version|version)$'; then
+        version
+        exit 0
+    fi
+
+    if echo "\$1" | grep -q -E '^(-h|--help|help)$'; then
+        usage "\$@"
+        exit 0
+    fi
+
+    if echo "\$1" | grep -q -E '^(-l|--list|list)$'; then
+        echo >&2 "[warn] the format of --list output may change"
+
+        # because we don't have sitemap.xml for dev sites yet
+        my_host="https://webinstall.dev"
+        my_len="\${#my_host}"
+
+        # 6 because the field will looks like "loc>WEBI_HOST/PKG_NAME"
+        # and the count is 1-indexed
+        my_count="\$((my_len + 6))"
+
+        curl -fsS "\${my_host}/sitemap.xml" |
+            grep -F "\${my_host}" |
+            cut -d'<' -f2 |
+            cut -c "\${my_count}"-
+
+        exit 0
+    fi
+
+    if echo "\${1}" | grep -q -E '^(--info|info)$'; then
+        if test -z "\${2}"; then
+            echo >&2 "Usage: webi --info <package>"
+            exit 1
+        fi
+
+        echo >&2 "[warn] the output of --info is completely half-baked and will change"
+        my_pkg="\${2}"
+        # TODO need a way to check that it exists at all (readme, win, lin)
+        echo ""
+        echo "    Cheat Sheet: \${WEBI_HOST}/\${my_pkg}"
+        echo "          POSIX: curl -sS \${WEBI_HOST}/\${my_pkg} | sh"
+        echo "        Windows: curl.exe -A MS \${WEBI_HOST}/\${my_pkg} | powershell"
+        echo "Releases (JSON): \${WEBI_HOST}/api/releases/\${my_pkg}.json"
+        echo " Releases (tsv): \${WEBI_HOST}/api/releases/\${my_pkg}.tab"
+        echo " (query params):     ?channel=stable&limit=10"
+        echo "                     &os=\${my_os}&arch=\${my_arch}"
+        echo " Install Script: \${WEBI_HOST}/api/installers/\${my_pkg}.sh?formats=tar,zip,xz,git,dmg,pkg"
+        echo "  Static Assets: \${WEBI_HOST}/packages/\${my_pkg}/README.md"
+        echo ""
+
+        # TODO os=linux,macos,windows (limit to tagged releases)
+        my_releases="\$(
+            curl -fsS "\${WEBI_HOST}/api/releases/\${my_pkg}.json?channel=stable&limit=1&pretty=true"
+        )"
+
+        if printf '%s\\n' "\${my_releases}" | grep -q "error"; then
+            my_releases_beta="\$(
+                curl -fsS "\${WEBI_HOST}/api/releases/\${my_pkg}.json?&limit=1&pretty=true"
+            )"
+            if printf '%s\\n' "\${my_releases_beta}" | grep -q "error"; then
+                echo >&2 "'\${my_pkg}' is a special case that does not have releases"
+            else
+                echo >&2 "ERROR no stable releases for '\${my_pkg}'!"
+            fi
+            exit 0
+        fi
+
+        echo >&2 "Stable '\${my_pkg}' releases:"
+        if command -v jq > /dev/null; then
+            printf '%s\\n' "\${my_releases}" |
+                jq
+        else
+            printf '%s\\n' "\${my_releases}"
+        fi
+
+        exit 0
+    fi
+
+    for pkgname in "\$@"; do
+        webinstall "\$pkgname"
+    done
+
+    show_path_updates
+
+}
+
+__webi_main "\$@"
+
+EOF
+
+    chmod a+x "$HOME/.local/bin/webi"
+
+    if [ -n "${WEBI_PKG-}" ]; then
+        "$HOME/.local/bin/webi" "${WEBI_PKG}"
+    else
+        echo ""
+        echo "Hmm... no WEBI_PKG was specified. This is probably an error in the script."
+        echo ""
+        echo "Please open an issue with this information: Package '${WEBI_PKG-}' on '$(uname -s)/$(uname -r) $(uname -m)'"
+        echo "    https://github.com/webinstall/packages/issues"
+        echo ""
+    fi
+
+}
+
+__install_webi

_webi/curl-pipe-bootstrap.tpl.sh

@@ -1,314 +0,0 @@
-#!/bin/sh
-#<pre>
-
-############################################################
-# <h1>Cheat Sheet at CHEATSHEET_URL</h1>
-# <meta http-equiv="refresh" content="3; URL='CHEATSHEET_URL'" />
-############################################################
-
-export WEBI_PKG=webi
-export WEBI_HOST=https://webinstall.dev
-export WEBI_CHECKSUM=06a7fb9f
-
-#########################################
-#                                       #
-# Display Debug Info in Case of Failure #
-#                                       #
-#########################################
-
-fn_show_welcome() { (
-    echo ""
-    echo ""
-    # invert t_task and t_pkg for top-level welcome message
-    printf -- ">>> %s %s  <<<\n" \
-        "$(t_pkg 'Welcome to') $(t_task 'Webi')$(t_pkg '!')" \
-        "$(t_dim "- modern tools, instant installs.")"
-    echo "    We expect your experience to be $(t_em 'absolutely perfect')!"
-    echo ""
-    echo "    $(t_attn 'Success')? Star it!   $(t_url 'https://github.com/webinstall/webi-installers')"
-    echo "    $(t_attn 'Problem')? Report it: $(t_url 'https://github.com/webinstall/webi-installers/issues')"
-    echo "                        $(t_dim "(your system is") $(t_host "$(uname -s)")/$(t_host "$(uname -m)") $(t_dim "with") $(t_host "$(fn_get_libc)") $(t_dim "&") $(t_host "$(fn_get_http_client_name)")$(t_dim ")")"
-
-    sleep 0.2
-); }
-
-fn_get_libc() { (
-    # Ex:
-    #     musl
-    #     libc
-    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
-        echo 'musl'
-    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
-        echo 'gnu'
-    else
-        echo 'libc'
-    fi
-); }
-
-fn_get_http_client_name() { (
-    # Ex:
-    #     curl
-    #     curl+wget
-    b_client=""
-    if command -v curl > /dev/null; then
-        b_client="curl"
-    fi
-    if command -v wget > /dev/null; then
-        if test -z "${b_client}"; then
-            b_client="wget"
-        else
-            b_client="curl+wget"
-        fi
-    fi
-
-    echo "${b_client}"
-); }
-
-#########################################
-#                                       #
-#      For Making the Display Nice      #
-#                                       #
-#########################################
-
-# Term Types
-t_cmd() { (fn_printf '\e[2m\e[35m%s\e[39m\e[22m' "${1}"); }
-t_host() { (fn_printf '\e[2m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_link() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_path() { (fn_printf '\e[2m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_pkg() { (fn_printf '\e[1m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_task() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_url() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-
-# Levels
-t_info() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_attn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_warn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_err() { (fn_printf '\e[31m%s\e[39m' "${1}"); }
-
-# Styles
-t_bold() { (fn_printf '\e[1m%s\e[22m' "${1}"); }
-t_dim() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-t_em() { (fn_printf '\e[3m%s\e[23m' "${1}"); }
-t_under() { (fn_printf '\e[4m%s\e[24m' "${1}"); }
-
-# FG Colors
-t_cyan() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_green() { (fn_printf '\e[32m%s\e[39m' "${1}"); }
-t_magenta() { (fn_printf '\e[35m%s\e[39m' "${1}"); }
-t_yellow() { (fn_printf '\e[33m%s\e[39m' "${1}"); }
-
-fn_printf() { (
-    a_style="${1}"
-    a_text="${2}"
-    if fn_is_tty; then
-        #shellcheck disable=SC2059
-        printf -- "${a_style}" "${a_text}"
-    else
-        printf -- '%s' "${a_text}"
-    fi
-); }
-
-fn_sub_home() { (
-    my_rel=${HOME}
-    my_abs=${1}
-    echo "${my_abs}" | sed "s:^${my_rel}:~:"
-); }
-
-###################################
-#                                 #
-#       Detect HTTP Client        #
-#                                 #
-###################################
-
-fn_wget() { (
-    # Doc:
-    #     Downloads the file at the given url to the given path
-    a_url="${1}"
-    a_path="${2}"
-
-    cmd_wget="wget -c -q --user-agent"
-    if fn_is_tty; then
-        cmd_wget="wget -c -q --show-progress --user-agent"
-    fi
-    # busybox wget doesn't support --show-progress
-    # See <https://github.com/webinstall/webi-installers/pull/772>
-    if readlink "$(command -v wget)" | grep -q busybox; then
-        cmd_wget="wget --user-agent"
-    fi
-
-    b_triple_ua="$(fn_get_target_triple_user_agent)"
-    b_agent="webi/wget ${b_triple_ua}"
-    if command -v curl > /dev/null; then
-        b_agent="webi/wget+curl ${b_triple_ua}"
-    fi
-
-    if ! $cmd_wget "${b_agent}" "${a_url}" -O "${a_path}"; then
-        echo >&2 "    $(t_err "failed to download (wget)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_wget '${b_agent}' '${a_url}' -O '${a_path}'"
-        echo >&2 "    $(wget -V)"
-        return 1
-    fi
-); }
-
-fn_curl() { (
-    # Doc:
-    #     Downloads the file at the given url to the given path
-    a_url="${1}"
-    a_path="${2}"
-
-    cmd_curl="curl -f -sSL -#"
-    if fn_is_tty; then
-        cmd_curl="curl -f -sSL"
-    fi
-
-    b_triple_ua="$(fn_get_target_triple_user_agent)"
-    b_agent="webi/curl ${b_triple_ua}"
-    if command -v wget > /dev/null; then
-        b_agent="webi/curl+wget ${b_triple_ua}"
-    fi
-
-    if ! $cmd_curl -A "${b_agent}" "${a_url}" -o "${a_path}"; then
-        echo >&2 "    $(t_err "failed to download (curl)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_curl -A '${b_agent}' '${a_url}' -o '${a_path}'"
-        echo >&2 "    $(curl -V)"
-        return 1
-    fi
-); }
-
-fn_get_target_triple_user_agent() { (
-    # Ex:
-    #     x86_64/unknown Linux/5.15.107-2-pve gnu
-    #     arm64/unknown Darwin/22.6.0 libc
-    echo "$(uname -m)/unknown $(uname -s)/$(uname -r) $(fn_get_libc)"
-); }
-
-fn_download_to_path() { (
-    a_url="${1}"
-    a_path="${2}"
-
-    mkdir -p "$(dirname "${a_path}")"
-    if command -v curl > /dev/null; then
-        fn_curl "${a_url}" "${a_path}.part"
-    elif command -v wget > /dev/null; then
-        fn_wget "${a_url}" "${a_path}.part"
-    else
-        echo >&2 "    $(t_err "failed to detect HTTP client (curl, wget)")"
-        return 1
-    fi
-    mv "${a_path}.part" "${a_path}"
-); }
-
-##############################################
-#                                            #
-# Install or Update Webi and Install Package #
-#                                            #
-##############################################
-
-webi_bootstrap() { (
-    a_path="${1}"
-
-    echo ""
-    echo "$(t_task 'Bootstrapping') $(t_pkg 'Webi')"
-
-    b_path_rel="$(fn_sub_home "${a_path}")"
-    b_checksum=""
-    if test -r "${a_path}"; then
-        b_checksum="$(fn_checksum "${a_path}")"
-    fi
-    if test "$b_checksum" = "${WEBI_CHECKSUM}"; then
-        echo "    $(t_dim 'Found') $(t_path "${b_path_rel}")"
-        sleep 0.1
-        return 0
-    fi
-
-    b_webi_file_url="${WEBI_HOST}/packages/webi/webi.sh"
-    b_tmp=''
-    if test -r "${a_path}"; then
-        b_ts="$(date -u '+%s')"
-        b_tmp="${a_path}.${b_ts}.bak"
-        mv "${a_path}" "${b_tmp}"
-        echo "    Updating $(t_path "${b_path_rel}")"
-    fi
-
-    echo "    Downloading $(t_url "${b_webi_file_url}")"
-    echo "        to $(t_path "${b_path_rel}")"
-    fn_download_to_path "${b_webi_file_url}" "${a_path}"
-    chmod u+x "${a_path}"
-
-    if test -r "${b_tmp}"; then
-        rm -f "${b_tmp}"
-    fi
-); }
-
-fn_checksum() {
-    a_filepath="${1}"
-
-    cmd_shasum='sha1sum'
-    if command -v shasum > /dev/null; then
-        cmd_shasum='shasum'
-    fi
-
-    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-}
-
-##############################################
-#                                            #
-#          Detect TTY and run main           #
-#                                            #
-##############################################
-
-fn_is_tty() {
-    if test "${WEBI_TTY}" = 'tty'; then
-        return 0
-    fi
-    return 1
-}
-
-fn_detect_tty() { (
-    # stdin will NOT be a tty if it's being piped
-    # stdout & stderr WILL be a tty even when piped
-    # they are not a tty if being captured or redirected
-    # 'set -i' is NOT available in sh
-    if test -t 1 && test -t 2; then
-        return 0
-    fi
-
-    return 1
-); }
-
-main() { (
-    set -e
-    set -u
-
-    WEBI_TTY="${WEBI_TTY:-}"
-    if test -z "${WEBI_TTY}"; then
-        if fn_detect_tty; then
-            WEBI_TTY="tty"
-        fi
-        export WEBI_TTY
-    fi
-
-    if test -z "${WEBI_WELCOME:-}"; then
-        fn_show_welcome
-    fi
-    export WEBI_WELCOME='shown'
-
-    # note: we may support custom locations in the future
-    export WEBI_HOME="${HOME}/.local"
-    b_home="$(fn_sub_home "${WEBI_HOME}")"
-    b_webi_path="${WEBI_HOME}/bin/webi"
-    b_webi_path_rel="${b_home}/bin/webi"
-
-    WEBI_CURRENT="${WEBI_CURRENT:-}"
-    if test "${WEBI_CURRENT}" != "${WEBI_CHECKSUM}"; then
-        webi_bootstrap "${b_webi_path}"
-        export WEBI_CURRENT="${WEBI_CHECKSUM}"
-    fi
-
-    echo "    Running $(t_cmd "${b_webi_path_rel} ${WEBI_PKG}")"
-    echo ""
-
-    "${b_webi_path}" "${WEBI_PKG}"
-); }
-
-main

_webi/example_install_safe_copy.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+set -u
+
+# For installing from the extracted package tmp directory
+pkg_install() {
+    (
+        cd "$WEBI_TMP"
+
+        if command -v rsync 2> /dev/null | grep -q rsync; then
+            rsync -Krl ./xmpl*/ "$pkg_src/" 2> /dev/null
+        else
+            cp -Hr ./xmpl*/* "$pkg_src/" 2> /dev/null
+            cp -Hr ./xmpl*/.* "$pkg_src/" 2> /dev/null
+        fi
+        rm -rf ./xmpl*
+
+    )
+}

_webi/normalize.js

@@ -13,7 +13,6 @@ var osMap = {
 var maps = {
   oses: {},
   arches: {},
-  libcs: {},
   formats: {},
 };
 
@@ -29,14 +28,14 @@ formats.forEach(function (name) {
 // evaluation order matters
 // (i.e. otherwise x86 and x64 can cross match)
 var arches = [
-  // arm64/aarch64 has very high specificity, so it comes first
-  'arm64',
-  // arm 7 is also generic aarch/arm/arm32
+  // arm 7 cannot be confused with arm64
   'armv7l',
-  // arm6 can run on armv7
-  'armv6l',
-  // amd64 is more likely and less often specified than arm64
+  // amd64 is more likely than arm64
   'amd64',
+  // arm6 has the same prefix as arm64
+  'armv6l',
+  // arm64 is more likely than arm6, and should be the default
+  'arm64',
   'x86',
   'ppc64le',
   'ppc64',
@@ -50,13 +49,13 @@ var arches = [
 // https://git.com/org/foo/releases/v0.7.9/foo-x86_64-linux-musl.tar.gz
 //
 var archMap = {
-  arm64: /(\b|_)(aarch64|arm64)/i,
-  armv7l: /(\b|_)(arm32|arm[_\-]?v?7l?)/i,
-  armv6l: /(\b|_)(arm|aarch32|arm[_\-]?v?6l?)(\b|_)/i,
+  armv7l: /(\b|_)(armv?7l?)/i,
   //amd64: /(amd.?64|x64|[_\-]64)/i,
   amd64:
     /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64([_\-]?bit)?(\b|_)/i,
   //x86: /(86)(\b|_)/i,
+  armv6l: /(\b|_)(aarch32|armv?6l?)(\b|_)/i,
+  arm64: /(\b|_)((aarch|arm)64|arm)/i,
   x86: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)(86|32)([_\-]?bit)(\b|_)/i,
   ppc64le: /(\b|_)(ppc64le)/i,
   ppc64: /(\b|_)(ppc64)(\b|_)/i,
@@ -66,18 +65,11 @@ arches.forEach(function (name) {
   maps.arches[name] = true;
 });
 
-var libcs = ['none', 'musl', 'gnu', 'msvc', 'libc'];
-libcs.forEach(function (name) {
-  maps.libcs[name] = true;
-});
-
 function normalize(all) {
-  /* jshint maxcomplexity:50 */
-  /* jshint maxdepth:10 */
+  /* jshint maxcomplexity:26 */
   var supported = {
     oses: {},
     arches: {},
-    libcs: {},
     formats: {},
   };
 
@@ -102,6 +94,16 @@ function normalize(all) {
         }
       }
     }
+
+    // Hacky-doo for musl
+    // TODO 'libc' some sort of glibc vs musl tag?
+    if (!rel._musl_native) {
+      if (!rel._musl) {
+        if (/(\b|\.|_|-)(musl)(\b|\.|_|-)/.test(rel.download)) {
+          rel._musl = true;
+        }
+      }
+    }
     supported.oses[rel.os] = true;
 
     if (!rel.arch) {
@@ -121,60 +123,6 @@ function normalize(all) {
     }
     supported.arches[rel.arch] = true;
 
-    // note: depends on rel.os
-    if (!rel.libc) {
-      let isMusl;
-      let isMsvc;
-      let isStatic;
-      let isGnu;
-
-      // extra blocks to prevent copy pasta errors
-
-      {
-        let muslRe = /(\b|_)(musl)(\b|_)/i;
-        isMusl = muslRe.test(rel.download) || muslRe.test(rel.name);
-      }
-
-      {
-        let msvcRe = /(\b|_)(msvc)(\b|_)/i;
-        isMsvc = msvcRe.test(rel.download) || msvcRe.test(rel.name);
-      }
-
-      {
-        let staticRe = /(\b|_)(static)(\b|_)/i;
-        isStatic = staticRe.test(rel.download) || staticRe.test(rel.name);
-      }
-
-      {
-        let gnuRe = /(\b|_)(gnu|glibc|libc)(\b|_)/i;
-        isGnu = gnuRe.test(rel.download) || gnuRe.test(rel.name);
-      }
-
-      if (isMusl) {
-        // we specifically tag things that need musl++ in their own releases
-        rel.libc = 'none';
-      } else if (isStatic) {
-        rel.libc = 'none';
-      } else if (isGnu) {
-        rel.libc = 'gnu';
-        if (rel.os === 'windows') {
-          // windows gnu is static
-          rel.libc = 'none';
-        } else if (rel.os === 'darwin') {
-          // if glibc is required on macos, it'll be static
-          rel.libc = 'none';
-        }
-      } else if (isMsvc) {
-        rel.libc = 'msvc';
-      } else {
-        // The default is no requirement for any particular libc
-        // (Go, Zig, POSIX Shell, JS, etc)
-        // and hopefully we never have to worry about mingw and friends
-        rel.libc = 'none';
-      }
-    }
-    supported.libcs[rel.libc] = true;
-
     var tarExt;
     if (!rel.ext) {
       // pkg-v1.0.tar.gz => ['gz', 'tar', '0', 'pkg-v1']
@@ -231,9 +179,6 @@ function normalize(all) {
   all.arches = Object.keys(supported.arches).filter(function (name) {
     return maps.arches[name];
   });
-  all.libcs = Object.keys(supported.libcs).filter(function (name) {
-    return maps.libcs[name];
-  });
   all.formats = Object.keys(supported.formats).filter(function (name) {
     return maps.formats[name];
   });
@@ -254,5 +199,4 @@ module.exports._debug = function (all) {
 // NOT in order of priority (which would be tar, xz, zip, ...)
 module.exports.formats = formats;
 module.exports.arches = arches;
-module.exports.libcs = libcs;
 module.exports.formatsMap = maps.formats;

_webi/package-install.tpl.ps1

@@ -1,155 +0,0 @@
-#!/usr/bin/env pwsh
-#350 check if windows user run as admin
-
-# this allows us to call ps1 files, which allows us to have spaces in filenames
-# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
-# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
-Set-ExecutionPolicy -Scope Process Bypass
-
-# If a command returns an error, halt the script.
-$ErrorActionPreference = 'Stop'
-
-# Ignore progress events from cmdlets so Invoke-WebRequest is not painfully slow
-$ProgressPreference = 'SilentlyContinue'
-
-$Env:WEBI_HOST = 'https://webinstall.dev'
-#$Env:WEBI_PKG = 'node@lts'
-#$Env:PKG_NAME = node
-#$Env:WEBI_VERSION = v12.16.2
-#$Env:WEBI_GIT_TAG = 12.16.2
-#$Env:WEBI_PKG_URL = "https://.../node-....zip"
-#$Env:WEBI_PKG_FILE = "node-v12.16.2-win-x64.zip"
-#$Env:WEBI_PKG_PATHNAME = "node-v12.16.2-win-x64.zip"
-
-# Switch to userprofile
-Push-Location $Env:USERPROFILE
-
-# Make paths
-New-Item -Path "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | Out-Null
-New-Item -Path "$Env:USERPROFILE\.local\bin" -ItemType Directory -Force | Out-Null
-New-Item -Path "$Env:USERPROFILE\.local\opt" -ItemType Directory -Force | Out-Null
-
-# {{ baseurl }}
-# {{ version }}
-
-# See
-#   - <https://superuser.com/q/1264444>
-#   - <https://stackoverflow.com/a/60572643/151312>
-$Esc = [char]27
-$TTask = "${Esc}[36m"
-$TName = "${Esc}[1m${Esc}[32m"
-$TUrl = "${Esc}[2m"
-$TPath = "${Esc}[2m${Esc}[32m"
-$TCmd = "${Esc}[2m${Esc}[35m"
-$TDim = "${Esc}[2m"
-$TReset = "${Esc}[0m"
-
-function Invoke-DownloadUrl {
-    Param (
-        [string]$URL,
-        [string]$Params,
-        [string]$Path,
-        [switch]$Force
-    )
-
-    IF (Test-Path -Path "$Path") {
-        IF (-Not $Force.IsPresent) {
-            Write-Host "    ${TDim}Found${TReset} $Path"
-            return
-        }
-        Write-Host "    Updating ${TDim}${Path}${TDim}"
-    }
-
-    $TmpPath = "${Path}.part"
-    Remove-Item -Path $TmpPath -Force -ErrorAction Ignore
-
-    Write-Host "    Downloading ${TDim}from${TReset}"
-    Write-Host "      ${TDim}${URL}${TReset}"
-    IF ($Params.Length -ne 0) {
-        Write-Host "        ?$Params"
-        $URL = "${URL}?${Params}"
-    }
-    curl.exe '-#' -f -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
-
-    Remove-Item -Path $Path -Force -ErrorAction Ignore
-    Move-Item $TmpPath $Path
-    Write-Host "      Saved ${TPath}${Path}${TReset}"
-}
-
-function Get-UserAgent {
-    # This is the canonical CPU arch when the process is emulated
-    $my_arch = "$Env:PROCESSOR_ARCHITEW6432"
-
-    IF ($my_arch -eq $null -or $my_arch -eq "") {
-        # This is the canonical CPU arch when the process is native
-        $my_arch = "$Env:PROCESSOR_ARCHITECTURE"
-    }
-
-    IF ($my_arch -eq "AMD64") {
-        # Because PowerShell is sometimes AMD64 on Windows 10 ARM
-        # See https://oofhours.com/2020/02/04/powershell-on-windows-10-arm64/
-        $my_os_arch = wmic os get osarchitecture
-
-        # Using -clike because of the trailing newline
-        IF ($my_os_arch -clike "ARM 64*") {
-            $my_arch = "ARM64"
-        }
-    }
-
-    "PowerShell+curl Windows/10+ $my_arch msvc"
-}
-
-function webi_path_add($pathname) {
-    # C:\Users\me => C:/Users/me
-    $my_home = $Env:UserProfile
-    $my_home = $my_home.replace('\\', '/')
-    $my_home_re = [regex]::escape($my_home)
-
-    # ~/bin => %USERPROFILE%/bin
-    $pathname = $pathname.replace('~/', "$Env:UserProfile/")
-
-    # C:\Users\me\bin => %USERPROFILE%/bin
-    $my_pathname = $pathname.replace('\\', '/')
-    $my_pathname = $my_pathname -ireplace $my_home_re, "%USERPROFILE%"
-
-    $all_user_paths = [Environment]::GetEnvironmentVariable("Path", "User")
-    $user_paths = "${all_user_paths}".Trim(';').Split(';')
-    $exists_in_path = $false
-    foreach ($user_path in $user_paths) {
-        # C:\Users\me\bin => %USERPROFILE%/bin
-        $my_user_path = $user_path.replace('\\', '/')
-        $my_user_path = $my_user_path -ireplace $my_home_re, "%USERPROFILE%"
-
-        if ($my_user_path -ieq $my_pathname) {
-            $exists_in_path = $true
-        }
-    }
-    if (-Not $exists_in_path) {
-        $all_user_paths = "${pathname};${all_user_paths}".Trim(';')
-        [Environment]::SetEnvironmentVariable("Path", $all_user_paths, "User")
-        $null = Sync-EnvPath
-    }
-}
-
-function Sync-EnvPath {
-    $UserPath = [Environment]::GetEnvironmentVariable("Path", "User").Trim(';')
-    $MachinePath = [Environment]::GetEnvironmentVariable("Path", "Machine").Trim(';')
-    $Env:Path = "${UserPath};${MachinePath}"
-    [Environment]::SetEnvironmentVariable("Path", $Env:Path)
-    $Env:Path
-}
-
-$Env:WEBI_UA = Get-UserAgent
-
-#$has_local_bin = echo "$Env:PATH" | Select-String -Pattern '\.local.bin'
-#if (!$has_local_bin)
-#{
-webi_path_add ~/.local/bin
-#}
-
-# {{ installer }}
-
-webi_path_add ~/.local/bin
-
-# Done
-Pop-Location

_webi/package-install.tpl.sh

@@ -1,955 +0,0 @@
-#!/bin/sh
-
-__bootstrap_webi() {
-    #PKG_NAME=
-    #WEBI_OS=
-    #WEBI_ARCH=
-    #WEBI_LIBC=
-    #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_GIT_TAG=
-    #WEBI_LTS=
-    #WEBI_CHANNEL=
-    #WEBI_EXT=
-    #WEBI_FORMATS=
-    #WEBI_PKG_URL=
-    #WEBI_PKG_FILE=
-    #WEBI_PKG_PATHNAME=
-    #PKG_OSES=
-    #PKG_ARCHES=
-    #PKG_LIBCS=
-    #PKG_FORMATS=
-    WEBI_PKG_DOWNLOAD=""
-    WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
-    if command -v xdg-user-dir > /dev/null; then
-        WEBI_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)"
-        if [ "${WEBI_DOWNLOAD_DIR}" = "${HOME}" ]; then
-            WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
-        fi
-    fi
-
-    WEBI_PKG_PATH="${WEBI_DOWNLOAD_DIR}/webi/${PKG_NAME:-error}/${WEBI_VERSION:-latest}"
-
-    # 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
-
-        if command -v pkg_format_cmd_version > /dev/null; then
-            my_versioned_name="'$(pkg_format_cmd_version "$WEBI_VERSION")'"
-        else
-            my_versioned_name="'$pkg_cmd_name v$WEBI_VERSION'"
-        fi
-
-        echo "$my_versioned_name"
-    }
-
-    # Update symlinks as per $HOME/.local/opt and $HOME/.local/bin install paths.
-    webi_link() {
-        if command -v pkg_link > /dev/null; then
-            pkg_link
-            return 0
-        fi
-
-        if test -n "${WEBI_SINGLE}"; 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
-    }
-
-    # detect if this program is already installed
-    # or if an installed version may cause conflict
-    webi_check_installed() {
-        # Test for existing version
-        set +e
-        my_path="$PATH"
-        PATH="$(dirname "$pkg_dst_cmd"):$PATH"
-        export PATH
-        my_current_cmd="$(command -v "$pkg_cmd_name")"
-        set -e
-        if [ -n "$my_current_cmd" ]; then
-            my_canonical_name="$(_webi_canonical_name)"
-            if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
-                echo >&2 "    $(t_err "WARN: possible PATH conflict between $my_canonical_name and currently installed version")"
-                echo >&2 "    $(t_path "${pkg_dst_cmd}") (new)"
-                echo >&2 "    $(t_path "${my_current_cmd}") (existing)"
-                #my_current_version=false
-            fi
-            # 'readlink' can't read links in paths on macOS 🤦
-            # but that's okay, 'cmp -s' is good enough for us
-            if cmp -s "${pkg_src_cmd}" "${my_current_cmd}"; then
-                echo "    $(t_pkg "${my_canonical_name}") already installed:"
-                my_dst_rel="$(fn_sub_home "${pkg_dst}")"
-                printf "    %s" "$(t_link "${my_dst_rel}")"
-                if [ "${pkg_src_cmd}" != "${my_current_cmd}" ]; then
-                    my_src_rel="$(fn_sub_home "${pkg_src}")"
-                    printf " => %s" "$(t_path "${my_src_rel}")"
-                fi
-                echo ""
-                exit 0
-            fi
-            if [ -x "$pkg_src_cmd" ]; then
-                webi_link
-                echo "    Switched to ${my_canonical_name}:"
-                my_src_rel="$(fn_sub_home "${pkg_src}")"
-                my_dst_rel="$(fn_sub_home "${pkg_dst}")"
-                echo "    $(t_link "${my_dst_rel}") => $(t_path "${my_src_rel}")"
-                exit 0
-            fi
-        fi
-        export PATH="$my_path"
-    }
-
-    webi_check_available() {
-        if test "$WEBI_CHANNEL" != "error"; then
-            return 0
-        fi
-
-        {
-            echo ""
-            echo "    $(t_err "Error: no '${PKG_NAME:-"Unknown Package"}@${WEBI_TAG:-"Unknown Tag"}' release for '${WEBI_OS:-"Unknown OS"}' (${WEBI_LIBC:-"Unknown Libc"}) on '${WEBI_ARCH:-"Unknown CPU"}' as one of '${WEBI_FORMATS:-"Unknown File Type"}'")"
-            echo "      '$PKG_NAME' is available for '$PKG_OSES' ($PKG_LIBCS) on '$PKG_ARCHES' as one of '$PKG_FORMATS'"
-            echo "      (check that the package name and version are correct)"
-
-            echo ""
-            my_release_url="$(echo "$WEBI_RELEASES" | sed 's:?.*::')"
-            my_release_params="$(echo "$WEBI_RELEASES" | sed 's:.*?:?:')"
-            echo "      Double check at ${my_release_url}"
-            echo "          ${my_release_params}"
-            echo ""
-        } >&2
-
-        exit 1
-    }
-
-    # detect if file is downloaded, and how to download it
-    webi_download() {
-        my_url="${1}"
-        my_dl="${2}"
-        my_dl_name="${3:-${PKG_NAME}}"
-
-        my_dl_rel="$(fn_sub_home "${my_dl}")"
-
-        WEBI_PKG_DOWNLOAD="${my_dl}"
-        export WEBI_PKG_DOWNLOAD
-
-        if [ -e "${my_dl}" ]; then
-            echo "    $(t_dim 'Found') $(t_path "${my_dl_rel}")"
-            return 0
-        fi
-        echo "    Downloading $(t_pkg "${my_dl_name}") from"
-        echo "      $(t_url "${my_url}")"
-        fn_download_to_path "${my_url}" "${my_dl}"
-        echo "    $(t_dim 'Saved as') $(t_path "${my_dl_rel}")"
-    }
-
-    webi_git_clone() { (
-        my_url="${1}"
-        my_dl="${2}"
-
-        my_dl_rel="$(fn_sub_home "${my_dl}")"
-        if [ -e "${my_dl}" ]; then
-            echo "    $(t_dim 'Found') $(t_path "${my_dl_rel}")"
-
-            cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
-            return 0
-        fi
-
-        echo "    Cloning $(t_url "${my_url}")"
-        cmd_git="git clone --config advice.detachedHead=false --quiet --depth=1 --single-branch"
-        rm -rf "${my_dl}.part"
-        if ! $cmd_git "${my_url}" --branch "${WEBI_GIT_TAG}" "${my_dl}.part"; then
-            echo >&2 "    $(t_err "failed to git clone ${WEBI_PKG_URL}")"
-            exit 1
-        fi
-        mv "${my_dl}.part" "${my_dl}"
-
-        cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
-    ); }
-
-    # detect which archives can be used
-    webi_extract() { (
-        cd "$WEBI_TMP"
-
-        my_dl_rel="$(
-            fn_sub_home "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
-        )"
-        if [ "tar" = "$WEBI_EXT" ]; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif [ "zip" = "$WEBI_EXT" ]; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
-        elif [ "exe" = "$WEBI_EXT" ]; then
-            echo "    Moving $(t_path "${my_dl_rel}")"
-            echo "      to $(t_path "$(fn_sub_home "$(pwd)")")"
-            mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif [ "git" = "$WEBI_EXT" ]; then
-            echo "    Moving $(t_path "${my_dl_rel}")"
-            mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif [ "xz" = "$WEBI_EXT" ]; then
-            echo "    Inflating $(t_path "${my_dl_rel}")"
-            unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
-        else
-            echo "    $(t_err 'Failed to extract') $(t_path "${WEBI_PKG_PATH}/$WEBI_PKG_FILE")"
-            exit 1
-        fi
-    ); }
-
-    # use 'pathman' to update $HOME/.config/envman/PATH.env
-    webi_path_add() {
-        my_path="${1}"
-
-        fn_envman_init
-
-        # \v was chosen as it is extremely unlikely for a filename
-        # \1 could be an even better choice, but needs more testing.
-        # (currently tested working on: linux & mac)
-        # "\0001" should also work
-        my_delim="$(
-            printf '\v'
-        )"
-
-        my_path_expanded="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}\$HOME${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
-        )"
-
-        # A gift for @adamcstephens.
-        # See https://github.com/webinstall/webi-installers/issues/322
-        case "${PATH}" in
-            # matches whether the first, a middle, the last, or the only PATH entry
-            "${my_path_expanded}":* | \
-                *:"${my_path_expanded}":* | \
-                *:"${my_path_expanded}" | \
-                "${my_path_expanded}")
-
-                if fn_is_defined_in_all_shells "${my_path}"; then
-                    return 0
-                fi
-                ;;
-            *) ;;
-        esac
-
-        my_path_export="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}\$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}\$HOME/${my_delim}g"
-        )"
-
-        my_export="export PATH=\"$my_path_export:\$PATH\""
-
-        touch -a ~/.config/envman/PATH.env
-        if grep -q -F "${my_export}" ~/.config/envman/PATH.env; then
-            return 0
-        fi
-
-        echo "${my_export}" >> ~/.config/envman/PATH.env
-
-        mkdir -p "$_webi_tmp"
-        my_path_tilde="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}${HOME}${my_delim}~${my_delim}g"
-        )"
-
-        if ! test -f "$_webi_tmp/.PATH.env" ||
-            ! grep -q -F "${my_path_tilde}" "$_webi_tmp/.PATH.env"; then
-            echo "${my_path_tilde}" >> "$_webi_tmp/.PATH.env"
-        fi
-    }
-
-    fn_is_defined_in_all_shells() {
-        my_path="${1}"
-
-        my_path_expanded="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}\$HOME|${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
-        )"
-        my_paths="$(
-            echo "${my_path_expanded}"
-            # $HOME/foo
-            echo "${my_path_expanded}" |
-                sed "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g"
-            # ${HOME}/foo
-            echo "${my_path_expanded}" |
-                sed "s${my_delim}${HOME}${my_delim}\${HOME}${my_delim}g"
-            echo "${my_path}"
-        )"
-
-        my_confs="$(
-            echo "${HOME}/.profile"
-            echo "${HOME}/.bashrc"
-            echo "${HOME}/.zshrc"
-            echo "${HOME}/.config/fish/config.fish"
-        )"
-        for my_conf in $my_confs; do
-            if ! test -e "${my_conf}"; then
-                continue
-            fi
-
-            if ! grep -q -F "${my_paths}" "${my_conf}"; then
-                return 1
-            fi
-        done
-    }
-
-    # group common pre-install tasks as default
-    webi_pre_install() {
-        webi_check_installed
-        webi_check_available
-        if test "git" = "${WEBI_EXT}"; then
-            webi_git_clone \
-                "${WEBI_PKG_URL}" \
-                "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
-            return 0
-        fi
-        webi_download \
-            "${WEBI_PKG_URL}" \
-            "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
-        webi_extract
-    }
-
-    # move commands from the extracted archive directory
-    # to $HOME/.local/opt or $HOME/.local/bin
-    webi_install() {
-        b_src=''
-        if test -n "${WEBI_SINGLE}"; then
-            b_src="${pkg_src_cmd}"
-            mkdir -p "$(dirname "$pkg_src_cmd")"
-        else
-            echo "    Removing $(t_path "${pkg_src}")"
-            rm -rf "$pkg_src"
-            b_src="${pkg_src}"
-        fi
-
-        echo "    Moving $(t_path "${pkg_cmd_name}")"
-        echo "      to $(t_path "$(fn_sub_home "${b_src}")")"
-        mv ./"${pkg_cmd_name}"* "${b_src}"
-    }
-
-    # run post-install functions - just updating PATH by default
-    webi_post_install() {
-        if test -n "${pkg_no_exec}"; then
-            return 0
-        fi
-
-        webi_path_add "$(dirname "$pkg_dst_cmd")"
-    }
-
-    _webi_enable_exec() {
-        if command -v spctl > /dev/null && command -v xattr > /dev/null; then
-            # note: some packages contain files that cannot be affected by xattr
-            xattr -r -d com.apple.quarantine "$pkg_src" || true
-            return 0
-        fi
-    }
-
-    _webi_done_message() {
-        my_dst_rel="$(fn_sub_home "${pkg_dst_cmd}")"
-        my_canonical_name="$(_webi_canonical_name)"
-        echo ""
-        echo "    Installed $(t_pkg "${my_canonical_name}") as $(t_link "${my_dst_rel}")"
-    }
-
-    ##
-    ## 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 "${WEBI_PKG_PATH}"
-    mkdir -p "$HOME/.local/bin"
-    mkdir -p "$HOME/.local/opt"
-
-    if test -e ~/.local/bin; then
-        echo "    $(t_dim 'Found') $(t_path ' ~/.local/bin')"
-    else
-        echo "    Creating$(t_path ' ~/.local/bin')"
-        mkdir -p "$HOME/.local/bin"
-    fi
-
-    ##
-    ##
-    ## BEGIN custom override functions from <package>/install.sh
-    ##
-    ##
-
-    WEBI_SINGLE=
-
-    __init_installer() {
-        # the installer will be injected here
-        # {{ installer }}
-
-        return 0
-    }
-
-    __init_installer
-
-    ##
-    ##
-    ## END custom override functions
-    ##
-    ##
-
-    # run everything with defaults or overrides as needed
-    if command -v pkg_install > /dev/null ||
-        command -v pkg_link > /dev/null ||
-        command -v pkg_post_install > /dev/null ||
-        command -v pkg_done_message > /dev/null ||
-        command -v pkg_format_cmd_version > /dev/null ||
-        [ -n "${WEBI_SINGLE-}" ] ||
-        [ -n "${pkg_cmd_name-}" ] ||
-        [ -n "${pkg_dst_cmd-}" ] ||
-        [ -n "${pkg_dst_dir-}" ] ||
-        [ -n "${pkg_dst-}" ] ||
-        [ -n "${pkg_src_cmd-}" ] ||
-        [ -n "${pkg_src_dir-}" ] ||
-        [ -n "${pkg_src-}" ]; then
-
-        pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
-
-        pkg_no_exec="${pkg_no_exec:-}"
-
-        if [ -n "${pkg_no_exec}" ]; then
-            pkg_dst_cmd="${pkg_dst}"
-            pkg_src="${pkg_dst}"
-            pkg_src_cmd="${pkg_dst}"
-        elif [ -n "${WEBI_SINGLE}" ]; then
-            pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
-            pkg_dst="$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"
-        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
-        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
-        pkg_src_bin="$(dirname "$pkg_src_cmd")"
-        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
-        pkg_dst_bin="$(dirname "$pkg_dst_cmd")"
-
-        if command -v pkg_pre_install > /dev/null; then pkg_pre_install; else webi_pre_install; fi
-
-        (
-            cd "$WEBI_TMP"
-            my_src_rel="$(
-                fn_sub_home "${pkg_src_cmd}"
-            )"
-            if test -e "${pkg_src_cmd}"; then
-                echo "    $(t_dim 'Found') $(t_path "${my_src_rel}") $(t_dim '(remove to force reinstall)')"
-            else
-                echo "    Installing to $(t_path "${my_src_rel}")"
-                if command -v pkg_install > /dev/null; then pkg_install; else webi_install; fi
-                chmod a+x "$pkg_src"
-                chmod a+x "$pkg_src_cmd"
-            fi
-        )
-
-        if test -z "${pkg_no_exec}"; then
-            webi_link
-            _webi_enable_exec
-        fi
-        (
-            cd "$WEBI_TMP"
-            if command -v pkg_post_install > /dev/null; then pkg_post_install; else webi_post_install; fi
-        )
-
-        (
-            cd "$WEBI_TMP"
-            if command -v pkg_done_message > /dev/null; then pkg_done_message; else _webi_done_message; fi
-        )
-
-        echo ""
-    fi
-
-    webi_path_add "$HOME/.local/bin"
-    if [ -z "${_WEBI_CHILD-}" ] && [ -f "$_webi_tmp/.PATH.env" ]; then
-        if test -s "$_webi_tmp/.PATH.env"; then
-            # shellcheck disable=SC2088 # ~ should not expand here
-            echo "    Edit $(t_path '~/.config/envman/PATH.env') to add:"
-            sort -u "$_webi_tmp/.PATH.env" | while read -r my_new_path; do
-                echo "        $(t_path "${my_new_path}")"
-            done
-            echo ""
-
-            rm -f "$_webi_tmp/.PATH.env"
-
-            echo ">>> $(t_info 'ACTION REQUIRED') <<<"
-            echo "        Copy, paste & run the following command:"
-            echo "        $(t_attn 'source ~/.config/envman/PATH.env')"
-            echo "        (newly opened terminal windows will update automatically)"
-            echo ""
-        fi
-    fi
-
-    rm -rf "$WEBI_TMP"
-}
-
-#########################################
-#                                       #
-# Display Debug Info in Case of Failure #
-#                                       #
-#########################################
-
-fn_show_welcome_back() { (
-    if test -n "${WEBI_WELCOME:-}"; then
-        return 0
-    fi
-
-    echo ""
-    # invert t_task and t_pkg for top-level welcome message
-    printf -- ">>> %s %s  <<<\n" \
-        "$(t_pkg 'Welcome to') $(t_task 'Webi')$(t_pkg '!')" \
-        "$(t_dim "- modern tools, instant installs.")"
-    echo "    We expect your experience to be $(t_em 'absolutely perfect')!"
-    echo ""
-    echo "    $(t_attn 'Success')? Star it!   $(t_url 'https://github.com/webinstall/webi-installers')"
-    echo "    $(t_attn 'Problem')? Report it: $(t_url 'https://github.com/webinstall/webi-installers/issues')"
-    echo "                        $(t_dim "(your system is") $(t_host "$(uname -s)")/$(t_host "$(uname -m)") $(t_dim "with") $(t_host "$(fn_get_libc)") $(t_dim "&") $(t_host "$(fn_get_http_client_name)")$(t_dim ")")"
-
-    sleep 0.2
-); }
-
-fn_get_libc() { (
-    # Ex:
-    #     musl
-    #     libc
-    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
-        echo 'musl'
-    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
-        echo 'gnu'
-    else
-        echo 'libc'
-    fi
-); }
-
-fn_get_http_client_name() { (
-    # Ex:
-    #     curl
-    #     curl+wget
-    b_client=""
-    if command -v curl > /dev/null; then
-        b_client="curl"
-    fi
-    if command -v wget > /dev/null; then
-        if test -z "${b_client}"; then
-            b_client="wget"
-        else
-            b_client="curl+wget"
-        fi
-    fi
-
-    echo "${b_client}"
-); }
-
-#########################################
-#                                       #
-#      For Making the Display Nice      #
-#                                       #
-#########################################
-
-# Term Types
-t_cmd() { (fn_printf '\e[2m\e[35m%s\e[39m\e[22m' "${1}"); }
-t_host() { (fn_printf '\e[2m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_link() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_path() { (fn_printf '\e[2m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_pkg() { (fn_printf '\e[1m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_task() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_url() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-
-# Levels
-t_info() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_attn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_warn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_err() { (fn_printf '\e[31m%s\e[39m' "${1}"); }
-
-# Styles
-t_bold() { (fn_printf '\e[1m%s\e[22m' "${1}"); }
-t_dim() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-t_em() { (fn_printf '\e[3m%s\e[23m' "${1}"); }
-t_under() { (fn_printf '\e[4m%s\e[24m' "${1}"); }
-
-# FG Colors
-t_cyan() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_green() { (fn_printf '\e[32m%s\e[39m' "${1}"); }
-t_magenta() { (fn_printf '\e[35m%s\e[39m' "${1}"); }
-t_yellow() { (fn_printf '\e[33m%s\e[39m' "${1}"); }
-
-fn_printf() { (
-    a_style="${1}"
-    a_text="${2}"
-    if fn_is_tty; then
-        #shellcheck disable=SC2059
-        printf -- "${a_style}" "${a_text}"
-    else
-        printf -- '%s' "${a_text}"
-    fi
-); }
-
-fn_sub_home() { (
-    my_rel=${HOME}
-    my_abs=${1}
-    echo "${my_abs}" | sed "s:^${my_rel}:~:"
-); }
-
-###################################
-#                                 #
-#       Detect HTTP Client        #
-#                                 #
-###################################
-
-fn_wget() { (
-    # Doc:
-    #     Downloads the file at the given url to the given path
-    a_url="${1}"
-    a_path="${2}"
-
-    cmd_wget="wget -c -q --user-agent"
-    if fn_is_tty; then
-        cmd_wget="wget -c -q --show-progress --user-agent"
-    fi
-    # busybox wget doesn't support --show-progress
-    # See <https://github.com/webinstall/webi-installers/pull/772>
-    if readlink "$(command -v wget)" | grep -q busybox; then
-        cmd_wget="wget --user-agent"
-    fi
-
-    b_triple_ua="$(fn_get_target_triple_user_agent)"
-    b_agent="webi/wget ${b_triple_ua}"
-    if command -v curl > /dev/null; then
-        b_agent="webi/wget+curl ${b_triple_ua}"
-    fi
-
-    if ! $cmd_wget "${b_agent}" "${a_url}" -O "${a_path}"; then
-        echo >&2 "    $(t_err "failed to download (wget)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_wget '${b_agent}' '${a_url}' -O '${a_path}'"
-        echo >&2 "    $(wget -V)"
-        return 1
-    fi
-); }
-
-fn_curl() { (
-    # Doc:
-    #     Downloads the file at the given url to the given path
-    a_url="${1}"
-    a_path="${2}"
-
-    cmd_curl="curl -f -sSL -#"
-    if fn_is_tty; then
-        cmd_curl="curl -f -sSL"
-    fi
-
-    b_triple_ua="$(fn_get_target_triple_user_agent)"
-    b_agent="webi/curl ${b_triple_ua}"
-    if command -v wget > /dev/null; then
-        b_agent="webi/curl+wget ${b_triple_ua}"
-    fi
-
-    if ! $cmd_curl -A "${b_agent}" "${a_url}" -o "${a_path}"; then
-        echo >&2 "    $(t_err "failed to download (curl)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_curl -A '${b_agent}' '${a_url}' -o '${a_path}'"
-        echo >&2 "    $(curl -V)"
-        return 1
-    fi
-); }
-
-fn_get_target_triple_user_agent() { (
-    # Ex:
-    #     x86_64/unknown Linux/5.15.107-2-pve gnu
-    #     arm64/unknown Darwin/22.6.0 libc
-    echo "$(uname -m)/unknown $(uname -s)/$(uname -r) $(fn_get_libc)"
-); }
-
-fn_download_to_path() { (
-    a_url="${1}"
-    a_path="${2}"
-
-    mkdir -p "$(dirname "${a_path}")"
-    if command -v curl > /dev/null; then
-        fn_curl "${a_url}" "${a_path}.part"
-    elif command -v wget > /dev/null; then
-        fn_wget "${a_url}" "${a_path}.part"
-    else
-        echo >&2 "    $(t_err "failed to detect HTTP client (curl, wget)")"
-        return 1
-    fi
-    mv "${a_path}.part" "${a_path}"
-); }
-
-##############################################
-#                                            #
-# Install or Update Webi and Install Package #
-#                                            #
-##############################################
-
-webi_upgrade() { (
-    a_path="${1}"
-
-    b_path_rel="$(fn_sub_home "${a_path}")"
-    b_checksum=""
-    if test -r "${a_path}"; then
-        b_checksum="$(fn_checksum "${a_path}")"
-    fi
-    if test "$b_checksum" = "${WEBI_CHECKSUM}"; then
-        sleep 0.1
-        return 0
-    fi
-
-    b_webi_file_url="${WEBI_HOST}/packages/webi/webi.sh"
-    b_tmp=''
-    if test -r "${a_path}"; then
-        b_ts="$(date -u '+%s')"
-        b_tmp="${a_path}.${b_ts}.bak"
-        mv "${a_path}" "${b_tmp}"
-        echo ""
-        echo "$(t_task 'Updating') $(t_pkg 'Webi')"
-    fi
-
-    echo "    Downloading $(t_url "${b_webi_file_url}")"
-    echo "        to $(t_path "${b_path_rel}")"
-    fn_download_to_path "${b_webi_file_url}" "${a_path}"
-    chmod u+x "${a_path}"
-
-    if test -r "${b_tmp}"; then
-        rm -f "${b_tmp}"
-    fi
-); }
-
-fn_checksum() {
-    a_filepath="${1}"
-
-    cmd_shasum='sha1sum'
-    if command -v shasum > /dev/null; then
-        cmd_shasum='shasum'
-    fi
-
-    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-}
-
-##############################################
-#                                            #
-#          Detect TTY and run main           #
-#                                            #
-##############################################
-
-fn_is_tty() {
-    if test "${WEBI_TTY}" = 'tty'; then
-        return 0
-    fi
-    return 1
-}
-
-fn_detect_tty() { (
-    # stdin will NOT be a tty if it's being piped
-    # stdout & stderr WILL be a tty even when piped
-    # they are not a tty if being captured or redirected
-    # 'set -i' is NOT available in sh
-    if test -t 1 && test -t 2; then
-        return 0
-    fi
-
-    return 1
-); }
-
-main() { (
-    set -e
-    set -u
-    #set -x
-
-    export WEBI_HOST=
-    export WEBI_CHECKSUM=
-    export WEBI_PKG=
-
-    WEBI_TTY="${WEBI_TTY:-}"
-    if test -z "${WEBI_TTY}"; then
-        if fn_detect_tty; then
-            WEBI_TTY="tty"
-        fi
-        export WEBI_TTY
-    fi
-
-    if test -z "${WEBI_WELCOME:-}"; then
-        fn_show_welcome_back
-    fi
-    export WEBI_WELCOME='shown'
-
-    # note: we may support custom locations in the future
-    export WEBI_HOME="${HOME}/.local"
-    b_webi_path="${WEBI_HOME}/bin/webi"
-
-    WEBI_CURRENT="${WEBI_CURRENT:-}"
-    if test "${WEBI_CURRENT}" != "${WEBI_CHECKSUM}"; then
-        webi_upgrade "${b_webi_path}"
-        export WEBI_CURRENT="${WEBI_CHECKSUM}"
-    fi
-
-    echo "$(t_task 'Installing') $(t_pkg "${WEBI_PKG}") $(t_task '...')"
-    __bootstrap_webi
-); }
-
-##############################################
-#                                            #
-#          envman helper functions           #
-#                                            #
-##############################################
-
-fn_envman_init() { (
-    if ! test -r ~/.config/envman/; then
-        echo "    Initializing ~/.config/envman/"
-        mkdir -p ~/.config/envman/
-    fi
-
-    # Note: the variables $BASH, $ZSH_NAME, etc are always empty
-    # because the active shell is always sh when this script runs
-    fn_envman_init_load_sh
-    fn_envman_init_shell sh '.profile' '.ash_history'
-    fn_envman_init_shell bash '.bashrc' '.bash_history'
-    fn_envman_init_shell zsh '.zshrc' '.zsh_sessions'
-
-    if command -v fish > /dev/null; then
-        fn_envman_init_load_fish
-        fn_envman_init_fish
-    fi
-); }
-
-fn_envman_init_load_sh() { (
-    touch -a ~/.config/envman/load.sh
-    if grep -q -F 'ENVMAN_LOAD' ~/.config/envman/load.sh; then
-        return 0
-    fi
-
-    cat << LOAD_SH > ~/.config/envman/load.sh
-# Generated for envman. Do not edit.
-# shellcheck disable=SC1090
-
-touch -a ~/.config/envman/PATH.env
-touch -a ~/.config/envman/ENV.env
-touch -a ~/.config/envman/alias.env
-touch -a ~/.config/envman/function.env
-
-# ENV first because we may use it in PATH
-test -z "\${ENVMAN_LOAD:-}" && . ~/.config/envman/ENV.env
-test -z "\${ENVMAN_LOAD:-}" && . ~/.config/envman/PATH.env
-
-export ENVMAN_LOAD='loaded'
-
-# function first because we may use it in alias
-test -z "\${g_envman_load_sh:-}" && . ~/.config/envman/function.env
-test -z "\${g_envman_load_sh:-}" && . ~/.config/envman/alias.env
-
-g_envman_load_sh='loaded'
-LOAD_SH
-
-); }
-
-fn_envman_init_shell() { (
-    a_shell="${1}"
-    a_rc="${2}"
-    a_history="${3:-_history_file_doesnt_exist}"
-    a_login_shell="$(basename "${SHELL:-}")"
-
-    if ! command -v "${a_shell}" > /dev/null; then
-        return 0
-    fi
-
-    # .bashrc and .zshrc no longer exist by default on macOS
-    if ! test -e ~/"${a_rc}" && ! test -e ~/"${a_history}"; then
-        if test "${a_login_shell}" != "${a_shell}"; then
-            return 0
-        fi
-    fi
-
-    touch -a ~/"${a_rc}"
-    if grep -q -F '/.config/envman/load.sh' ~/"${a_rc}"; then
-        return 0
-    fi
-
-    # shellcheck disable=SC2088 # ~ should not expand here
-    echo >&2 "    Edit $(t_path "~/${a_rc}") to $(t_cmd "source ~/.config/envman/load.sh")"
-    {
-        echo ''
-        echo '# Generated for envman. Do not edit.'
-        #shellcheck disable=SC2016 # vars should not expand here
-        echo '[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"'
-    } >> ~/"${a_rc}"
-); }
-
-fn_envman_init_load_fish() { (
-    mkdir -p ~/.config/envman/
-
-    touch -a ~/.config/envman/load.fish
-    if grep -q -F 'ENVMAN_LOAD' ~/.config/envman/load.fish; then
-        return 0
-    fi
-
-    echo >&2 "    Create ~/.config/envman/load.fish"
-
-    cat << EOF > ~/.config/envman/load.fish
-# Generated for envman. Do not edit.
-
-touch -a ~/.config/envman/PATH.env
-touch -a ~/.config/envman/ENV.env
-touch -a ~/.config/envman/alias.env
-touch -a ~/.config/envman/function.env
-
-not set -q ENVMAN_LOAD; and source ~/.config/envman/ENV.env
-not set -q ENVMAN_LOAD; and source ~/.config/envman/PATH.env
-
-set -x ENVMAN_LOAD 'loaded'
-
-not set -q g_envman_load_fish; and source ~/.config/envman/function.env
-not set -q g_envman_load_fish; and source ~/.config/envman/alias.env
-
-set -g g_envman_load_fish 'loaded'
-EOF
-
-); }
-
-fn_envman_init_fish() {
-    mkdir -p ~/.config/fish/
-
-    touch -a ~/.config/fish/config.fish
-    if grep -q -F '/.config/envman/load.fish' ~/.config/fish/config.fish; then
-        return 0
-    fi
-
-    # shellcheck disable=SC2088 # ~ should not expand here
-    echo >&2 "    Edit $(t_path "~/.config/fish/config.fish") to $(t_cmd "source ~/.config/envman/load.fish")"
-
-    cat << EOF >> ~/.config/fish/config.fish
-
-# Generated for envman. Do not edit.
-test -s ~/.config/envman/load.fish; and source ~/.config/envman/load.fish
-EOF
-
-}
-
-main

_webi/releases.js

@@ -1,10 +1,8 @@
 'use strict';
 
-var Crypto = require('crypto');
-var Fs = require('node:fs/promises');
+var fs = require('node:fs');
 var path = require('node:path');
 var request = require('@root/request');
-
 var _normalize = require('../_webi/normalize.js');
 
 var reInstallTpl = /\s*#?\s*{{ installer }}/;
@@ -29,11 +27,10 @@ function padScript(txt) {
   return txt.replace(/^/g, '        ');
 }
 
-var BAD_SH_RE = /[<>'"`$\\]/;
 Releases.renderBash = async function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os = '', arch = '', libc = '', formats },
+  { baseurl, pkg, tag, ver, os = '', arch = '', formats },
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -41,116 +38,138 @@ Releases.renderBash = async function (
   if (!tag) {
     tag = '';
   }
-  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.sh'), 'utf8');
-  installTxt = padScript(installTxt);
-  var vers = rel.version.split('.');
-  var v = {
-    major: vers.shift() || '',
-    minor: vers.shift() || '',
-    patch: vers.join('.').replace(/[+\-].*/, ''),
-    build: vers
-      .join('.')
-      .replace(/[^+\-]*/, '')
-      .replace(/^-/, ''),
-  };
-  var pkgFile = rel.filename || rel.name;
-  let tplTxt = await Fs.readFile(
-    path.join(__dirname, 'package-install.tpl.sh'),
-    'utf8',
-  );
-  // ex: 'node@lts' or 'node'
-  var webiPkg = pkg;
-  if (ver) {
-    webiPkg += `@${ver}`;
-  }
+  return fs.promises
+    .readFile(path.join(pkgdir, 'install.sh'), 'utf8')
+    .then(function (installTxt) {
+      installTxt = padScript(installTxt);
+      var vers = rel.version.split('.');
+      var v = {
+        major: vers.shift() || '',
+        minor: vers.shift() || '',
+        patch: vers.join('.').replace(/[+\-].*/, ''),
+        build: vers
+          .join('.')
+          .replace(/[^+\-]*/, '')
+          .replace(/^-/, ''),
+      };
+      var pkgFile = rel.filename || rel.name;
+      return fs.promises
+        .readFile(path.join(__dirname, 'template.sh'), 'utf8')
+        .then(function (tplTxt) {
+          // ex: 'node@lts' or 'node'
+          var webiPkg = pkg;
+          if (ver) {
+            webiPkg += `@${ver}`;
+          }
+          return (
+            tplTxt
+              .replace(/CHEATSHEET_URL/g, `${baseurl}/${pkg}`)
+              .replace(/^\s*#?WEBI_PKG=.*/m, `WEBI_PKG='${webiPkg}'`)
+              .replace(/^\s*#?WEBI_HOST=.*/m, `WEBI_HOST='${baseurl}'`)
+              .replace(/^\s*#?WEBI_OS=.*/m, `WEBI_OS='${os}'`)
+              .replace(/^\s*#?WEBI_ARCH=.*/m, `WEBI_ARCH='${arch}'`)
+              .replace(/^\s*#?WEBI_TAG=.*/m, `WEBI_TAG='${tag}'`)
+              .replace(
+                /^\s*#?WEBI_RELEASES=.*/m,
+                "WEBI_RELEASES='" +
+                  baseurl +
+                  '/api/releases/' +
+                  pkg +
+                  '@' +
+                  tag +
+                  '.tab?os=' +
+                  rel.os +
+                  '&arch=' +
+                  rel.arch +
+                  '&formats=' +
+                  formats.join(',') +
+                  '&pretty=true' +
+                  "'",
+              )
+              .replace(
+                /^\s*#?WEBI_CSV=.*/m,
+                "WEBI_CSV='" +
+                  [
+                    rel.version,
+                    rel.lts,
+                    rel.channel,
+                    rel.date,
+                    rel.os,
+                    rel.arch,
+                    rel.ext,
+                    '-',
+                    rel.download,
+                    rel.name,
+                    rel.comment || '',
+                  ]
+                    .join(',')
+                    .replace(/'/g, '') +
+                  "'",
+              )
+              .replace(
+                /^\s*#?WEBI_VERSION=.*/m,
+                "WEBI_VERSION='" + rel.version + "'",
+              )
+              .replace(/^\s*#?WEBI_MAJOR=.*/m, 'WEBI_MAJOR=' + v.major)
+              .replace(/^\s*#?WEBI_MINOR=.*/m, 'WEBI_MINOR=' + v.minor)
+              .replace(/^\s*#?WEBI_PATCH=.*/m, 'WEBI_PATCH=' + v.patch)
+              .replace(/^\s*#?WEBI_BUILD=.*/m, 'WEBI_BUILD=' + v.build)
+              .replace(
+                /^\s*#?WEBI_GIT_TAG=.*/m,
+                "WEBI_GIT_TAG='" + rel.git_tag + "'",
+              )
+              .replace(/^\s*#?WEBI_LTS=.*/m, 'WEBI_LTS=' + rel.lts)
+              .replace(/^\s*#?WEBI_CHANNEL=.*/m, 'WEBI_CHANNEL=' + rel.channel)
+              .replace(
+                /^\s*#?WEBI_EXT=.*/m,
+                'WEBI_EXT=' + rel.ext.replace(/tar.*/, 'tar'),
+              )
+              .replace(
+                /^\s*#?WEBI_FORMATS=.*/m,
+                "WEBI_FORMATS='" + formats.join(',') + "'",
+              )
+              .replace(
+                /^\s*#?WEBI_PKG_URL=.*/m,
+                "WEBI_PKG_URL='" + rel.download + "'",
+              )
+              // TODO replace WEBI_PKG_FILE (which is sometimes a dir)
+              .replace(
+                /^\s*#?WEBI_PKG_PATHNAME=.*/m,
+                "WEBI_PKG_PATHNAME='" + pkgFile + "'",
+              )
+              // TODO deprecate
+              .replace(
+                /^\s*#?WEBI_PKG_FILE=.*/m,
+                "WEBI_PKG_FILE='" + pkgFile + "'",
+              )
+              // PKG details
+              .replace(/^\s*#?PKG_NAME=.*/m, "PKG_NAME='" + pkg + "'")
+              .replace(
+                /^\s*#?PKG_OSES=.*/m,
+                "PKG_OSES='" + ((rel && rel.oses) || []).join(',') + "'",
+              )
+              .replace(
+                /^\s*#?PKG_ARCHES=.*/m,
+                "PKG_ARCHES='" + ((rel && rel.arches) || []).join(',') + "'",
+              )
+              .replace(
+                /^\s*#?PKG_FORMATS=.*/m,
+                "PKG_FORMATS='" + ((rel && rel.formats) || []).join(',') + "'",
+              )
+              // $', $0, ... $9, $`, $&, and $_ all have special meaning
+              // (see https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RegExp)
+              // However, it can be escaped with $$ (which must be escaped with $$)
 
-  let releaseParams = new URLSearchParams({
-    os: rel.os,
-    arch: rel.arch,
-    libc: rel.libc,
-    formats: formats.join(','),
-    pretty: true,
-  });
-  let releaseSearch = releaseParams.toString();
-  releaseSearch = releaseSearch.replace(/%2C/g, ',');
-  let releaseUrl = `/api/releases/${pkg}@${tag}.tab?${releaseSearch}`;
-  let releaseCsv = [
-    rel.version,
-    rel.lts,
-    rel.channel,
-    rel.date,
-    rel.os,
-    rel.arch,
-    rel.ext,
-    '-',
-    rel.download,
-    rel.name,
-    rel.comment || '',
-  ]
-    .join(',')
-    .replace(/'/g, '');
-
-  let webiChecksum = await Releases.getWebiShChecksum();
-  let envReplacements = [
-    ['WEBI_CHECKSUM', webiChecksum],
-    ['WEBI_PKG', webiPkg],
-    ['WEBI_HOST', baseurl],
-    ['WEBI_OS', os],
-    ['WEBI_ARCH', arch],
-    ['WEBI_LIBC', libc],
-    ['WEBI_TAG', tag],
-    ['WEBI_RELEASES', `${baseurl}/${releaseUrl}`],
-    ['WEBI_CSV', releaseCsv],
-    ['WEBI_VERSION', rel.version],
-    ['WEBI_MAJOR', v.major],
-    ['WEBI_MINOR', v.minor],
-    ['WEBI_PATCH', v.patch],
-    ['WEBI_BUILD', v.build],
-    ['WEBI_GIT_BRANCH', rel.git_branch || rel.git_tag],
-    ['WEBI_GIT_TAG', rel.git_tag], // TODO replace with branch
-    ['WEBI_LTS', rel.lts],
-    ['WEBI_CHANNEL', rel.channel],
-    ['WEBI_EXT', rel.ext.replace(/tar.*/, 'tar')],
-    ['WEBI_FORMATS', formats.join(',')],
-    ['WEBI_PKG_URL', rel.download],
-    ['WEBI_PKG_PATHNAME', pkgFile],
-    ['WEBI_PKG_FILE', pkgFile], // TODO replace with pathname
-    ['PKG_NAME', pkg],
-    ['PKG_OSES', rel.oses],
-    ['PKG_ARCHES', rel.arches],
-    ['PKG_LIBCS', rel.libcs],
-    ['PKG_FORMATS', (rel.formats || []).join(',')],
-  ];
-
-  for (let env of envReplacements) {
-    let name = env[0];
-    let value = env[1];
-    // Ex:
-    // #export WEBI_FOO=xyz => export WEBI_FOO='123'
-    // export WEBI_FOO=     => export WEBI_FOO='123'
-    let envRe = new RegExp(
-      `^[ \\t]*#?[ \\t]*(export[ \\t])?[ \\t]*(${name})=.*`,
-      'm',
-    );
-    if (BAD_SH_RE.test(value)) {
-      throw new Error(`key '${name}' has invalid value '${value}'`);
-    }
-    tplTxt = tplTxt.replace(envRe, `$1$2='${value}'`);
-  }
-
-  tplTxt = tplTxt
-    .replace(/CHEATSHEET_URL/g, `${baseurl}/${pkg}`)
-    // $', $0, ... $9, $`, $&, and $_ all have special meaning
-    // (see https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RegExp)
-    // However, it can be escaped with $$ (which must be escaped with $$)
-    .replace(reInstallTpl, '\n' + installTxt.replace(/\$/g, '$$$$'));
-  return tplTxt;
+              .replace(reInstallTpl, '\n' + installTxt.replace(/\$/g, '$$$$'))
+          );
+        });
+    });
 };
 
 Releases.renderPowerShell = async function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os, arch, libc = '', formats },
+  { baseurl, pkg, tag, ver, os, arch, formats },
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -158,91 +177,64 @@ Releases.renderPowerShell = async function (
   if (!tag) {
     tag = '';
   }
-  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.ps1'), 'utf8');
-  installTxt = padScript(installTxt);
-  /*
-    var vers = rel.version.split('.');
-    var v = {
-      major: vers.shift() || '',
-      minor: vers.shift() || '',
-      patch: vers.join('.').replace(/[+\-].*$/, ''),
-      build: vers
-        .join('.')
-        .replace(/[^+\-]*()/, '')
-        .replace(/^-/, '')
-    };
-  */
-  let tplTxt = await Fs.readFile(
-    path.join(__dirname, 'package-install.tpl.ps1'),
-    'utf8',
-  );
-  var pkgver = pkg + '@' + ver;
-  return (
-    tplTxt
-      .replace(
-        /^(#)?\$Env:WEBI_LIBC\s*=.*/im,
-        "$Env:WEBI_LIBC = '" + libc + "'",
-      )
-      .replace(
-        /^(#)?\$Env:WEBI_HOST\s*=.*/im,
-        "$Env:WEBI_HOST = '" + baseurl + "'",
-      )
-      .replace(
-        /^(#)?\$Env:WEBI_PKG\s*=.*/im,
-        "$Env:WEBI_PKG = '" + pkgver + "'",
-      )
-      .replace(/^(#)?\$Env:PKG_NAME\s*=.*/im, "$Env:PKG_NAME = '" + pkg + "'")
-      .replace(
-        /^(#)?\$Env:WEBI_VERSION\s*=.*/im,
-        "$Env:WEBI_VERSION = '" + rel.version + "'",
-      )
-      .replace(
-        /^(#)?\$Env:WEBI_GIT_TAG\s*=.*/im,
-        "$Env:WEBI_GIT_TAG = '" + rel.git_tag + "'",
-      )
-      .replace(
-        /^(#)?\$Env:WEBI_PKG_URL\s*=.*/im,
-        "$Env:WEBI_PKG_URL = '" + rel.download + "'",
-      )
-      // TODO replace WEBI_PKG_FILE (which is sometimes a dir)
-      .replace(
-        /^(#)?\$Env:WEBI_PKG_PATHNAME\s*=.*/im,
-        "$Env:WEBI_PKG_PATHNAME = '" + rel.name + "'",
-      )
-      // TODO deprecate
-      .replace(
-        /^(#)?\$Env:WEBI_PKG_FILE\s*=.*/im,
-        "$Env:WEBI_PKG_FILE = '" + rel.name + "'",
-      )
-      .replace(reInstallTpl, '\n' + installTxt)
-  );
-};
-
-var _webiShMeta = {
-  stale: 10 * 1000,
-  updated_at: 0,
-  checksum: '',
-  mtime: 0,
-};
-Releases.getWebiShChecksum = async function () {
-  let now = Date.now();
-  let ago = now - _webiShMeta.updated_at;
-  if (ago <= _webiShMeta.stale) {
-    return _webiShMeta.checksum;
-  }
-
-  let webiPath = path.join(__dirname, '../webi/webi.sh');
-  let stat = await Fs.stat(webiPath);
-  if (stat.mtimeMs === _webiShMeta.mtime) {
-    return _webiShMeta.checksum;
-  }
-
-  let webiBuf = await Fs.readFile(webiPath, null);
-  let webiHash = Crypto.createHash('sha1').update(webiBuf).digest('hex');
-  let webiChecksum = webiHash.slice(0, 8);
-
-  _webiShMeta.mtime = stat.mtimeMs;
-  _webiShMeta.updated_at = now;
-  _webiShMeta.checksum = webiChecksum;
-  return _webiShMeta.checksum;
+  return fs.promises
+    .readFile(path.join(pkgdir, 'install.ps1'), 'utf8')
+    .then(function (installTxt) {
+      installTxt = padScript(installTxt);
+      /*
+      var vers = rel.version.split('.');
+      var v = {
+        major: vers.shift() || '',
+        minor: vers.shift() || '',
+        patch: vers.join('.').replace(/[+\-].*$/, ''),
+        build: vers
+          .join('.')
+          .replace(/[^+\-]*()/, '')
+          .replace(/^-/, '')
+      };
+      */
+      return fs.promises
+        .readFile(path.join(__dirname, 'template.ps1'), 'utf8')
+        .then(function (tplTxt) {
+          var pkgver = pkg + '@' + ver;
+          return (
+            tplTxt
+              .replace(
+                /^(#)?\$Env:WEBI_HOST\s*=.*/im,
+                "$Env:WEBI_HOST = '" + baseurl + "'",
+              )
+              .replace(
+                /^(#)?\$Env:WEBI_PKG\s*=.*/im,
+                "$Env:WEBI_PKG = '" + pkgver + "'",
+              )
+              .replace(
+                /^(#)?\$Env:PKG_NAME\s*=.*/im,
+                "$Env:PKG_NAME = '" + pkg + "'",
+              )
+              .replace(
+                /^(#)?\$Env:WEBI_VERSION\s*=.*/im,
+                "$Env:WEBI_VERSION = '" + rel.version + "'",
+              )
+              .replace(
+                /^(#)?\$Env:WEBI_GIT_TAG\s*=.*/im,
+                "$Env:WEBI_GIT_TAG = '" + rel.git_tag + "'",
+              )
+              .replace(
+                /^(#)?\$Env:WEBI_PKG_URL\s*=.*/im,
+                "$Env:WEBI_PKG_URL = '" + rel.download + "'",
+              )
+              // TODO replace WEBI_PKG_FILE (which is sometimes a dir)
+              .replace(
+                /^(#)?\$Env:WEBI_PKG_PATHNAME\s*=.*/im,
+                "$Env:WEBI_PKG_PATHNAME = '" + rel.name + "'",
+              )
+              // TODO deprecate
+              .replace(
+                /^(#)?\$Env:WEBI_PKG_FILE\s*=.*/im,
+                "$Env:WEBI_PKG_FILE = '" + rel.name + "'",
+              )
+              .replace(reInstallTpl, '\n' + installTxt)
+          );
+        });
+    });
 };

_webi/serve-installer.js

@@ -1,8 +1,5 @@
 'use strict';
 
-var Installers = module.exports;
-
-var Fs = require('fs/promises');
 var path = require('path');
 
 var uaDetect = require('./ua-detect.js');
@@ -12,37 +9,13 @@ var Releases = require('./releases.js');
 // handlers caching and transformation, probably should be broken down
 var getReleases = require('./transform-releases.js');
 
-Installers.INSTALLERS_DIR = path.join(__dirname, '..');
-Installers.serveInstaller = async function (
-  baseurl,
-  ua,
-  pkg,
-  tag,
-  ext,
-  formats,
-  libc,
-) {
-  let [rel, opts] = await Installers.helper({
-    ua,
-    pkg,
-    tag,
-    formats,
-    libc,
-  });
-  Object.assign(opts, {
-    baseurl,
-  });
+var installersDir = path.join(__dirname, '..');
 
-  var pkgdir = path.join(Installers.INSTALLERS_DIR, pkg);
-  if ('ps1' === ext) {
-    return Releases.renderPowerShell(pkgdir, rel, opts);
-  }
-  return Releases.renderBash(pkgdir, rel, opts);
-};
-Installers.helper = async function ({ ua, pkg, tag, formats, libc }) {
+serveInstaller.serveInstaller = serveInstaller;
+module.exports = serveInstaller;
+async function serveInstaller(baseurl, ua, pkg, tag, ext, formats) {
   // TODO put some of this in a middleware? or common function?
 
-  // TODO maybe move package/version/lts/channel detection into getReleases
   var ver = tag.replace(/^v/, '');
   var lts;
   var channel;
@@ -71,21 +44,12 @@ Installers.helper = async function ({ ua, pkg, tag, formats, libc }) {
       break;
   }
 
+  // TODO maybe move package/version/lts/channel detection into getReleases
   var myOs = uaDetect.os(ua);
   var myArch = uaDetect.arch(ua);
-  var myLibc;
-  if (libc) {
-    myLibc = uaDetect.libc(libc);
-  }
-  if (!myLibc) {
-    myLibc = uaDetect.libc(ua);
-  }
-  if (!myLibc) {
-    myLibc = 'libc';
-  }
-
+  var myLibc = uaDetect.libc(ua);
   let cfg = await packages.get(pkg);
-  let releaseQuery = {
+  let rels = await getReleases({
     pkg: cfg.alias || pkg,
     ver,
     os: myOs,
@@ -93,118 +57,30 @@ Installers.helper = async function ({ ua, pkg, tag, formats, libc }) {
     libc: myLibc,
     lts,
     channel,
-    // TODO use formats for sorting, not exclusion
-    // (it's better to install xz or report an error to install zip)
     formats,
     limit: 1,
-  };
-
-  let rels = await getReleases(releaseQuery);
+  });
 
   var rel = rels.releases[0];
+  var pkgdir = path.join(installersDir, pkg);
   var opts = {
+    baseurl,
     pkg: cfg.alias || pkg,
     ver,
     tag,
     os: myOs,
     arch: myArch,
-    libc: myLibc,
     lts,
     channel,
     formats,
     limit: 1,
   };
-  rel = Object.assign(
-    {
-      oses: rels.oses,
-      arches: rels.arches,
-      libcs: rels.libcs,
-      formats: rels.formats,
-    },
-    rel,
-  );
+  rel.oses = rels.oses;
+  rel.arches = rels.arches;
+  rel.formats = rels.formats;
 
-  return [rel, opts];
-};
-
-var CURL_PIPE_PS1_BOOT = path.join(__dirname, 'curl-pipe-bootstrap.tpl.ps1');
-var CURL_PIPE_SH_BOOT = path.join(__dirname, 'curl-pipe-bootstrap.tpl.sh');
-var BAD_SH_RE = /[<>'"`$\\]/;
-
-Installers.getPosixCurlPipeBootstrap = async function ({ baseurl, pkg, ver }) {
-  let bootTxt = await Fs.readFile(CURL_PIPE_SH_BOOT, 'utf8');
-
-  var webiPkg = [pkg, ver].filter(Boolean).join('@');
-  var webiChecksum = await Releases.getWebiShChecksum();
-  var envReplacements = [
-    ['WEBI_PKG', webiPkg],
-    ['WEBI_HOST', baseurl],
-    ['WEBI_CHECKSUM', webiChecksum],
-  ];
-
-  for (let env of envReplacements) {
-    let name = env[0];
-    let value = env[1];
-
-    // TODO create REs once, in higher scope
-    let envRe = new RegExp(
-      `^[ \\t]*#?[ \\t]*(export[ \\t])?[ \\t]*(${name})=.*`,
-      'm',
-    );
-
-    if (BAD_SH_RE.test(value)) {
-      throw new Error(`key '${name}' has invalid value '${value}'`);
-    }
-
-    bootTxt = bootTxt.replace(envRe, `$1$2='${value}'`);
+  if ('ps1' === ext) {
+    return Releases.renderPowerShell(pkgdir, rel, opts);
   }
-  // TODO init config here
-  //bootTxt.replace(/CHEATSHEET_URL/g, `${Config.cheatUrl}/${pkg}`);
-
-  return bootTxt;
-};
-
-Installers.getPwshCurlPipeBootstrap = async function ({
-  baseurl,
-  pkg,
-  ver,
-  exename,
-}) {
-  let bootTxt = await Fs.readFile(CURL_PIPE_PS1_BOOT, 'utf8');
-
-  var webiPkg = [pkg, ver].filter(Boolean).join('@');
-  //var webiChecksum = await Releases.getWebiPs1Checksum();
-  var envReplacements = [
-    ['Env:WEBI_PKG', webiPkg],
-    ['Env:WEBI_HOST', baseurl],
-    //['Env:WEBI_CHECKSUM', webiChecksum],
-    ['baseurl', baseurl],
-    ['exename', exename],
-    ['version', ver],
-  ];
-
-  for (let env of envReplacements) {
-    let name = env[0];
-    let value = env[1];
-
-    if (BAD_SH_RE.test(value)) {
-      throw new Error(`key '${name}' has invalid value '${value}'`);
-    }
-
-    let tplRe = new RegExp(`{{ (${name}) }}`, 'g');
-    bootTxt = bootTxt.replace(tplRe, `${value}`);
-
-    // let envRe = new RegExp(`^[ \\t]*#?[ \\t]*($$${name})[ \\t]*=.*`, 'im');
-    // bootTxt = bootTxt.replace(envRe, `$$${name} = '${value}'`);
-
-    let setRe = new RegExp(
-      `(#[ \\t]*)?(\\$${name})[ \\t]*=[ \\t]['"].*['"][ \\t]`,
-      'im',
-    );
-    bootTxt = bootTxt.replace(setRe, `$$${name} = '${value}'`);
-  }
-  // TODO init config here
-  //bootTxt.replace(/CHEATSHEET_URL/g, `${Config.cheatUrl}/${pkg}`);
-
-  return bootTxt;
-};
+  return Releases.renderBash(pkgdir, rel, opts);
+}

_webi/template.ps1

@@ -0,0 +1,127 @@
+#!/usr/bin/env pwsh
+#350 check if windows user run as admin
+
+function Confirm-IsElevated {
+    $id = [System.Security.Principal.WindowsIdentity]::GetCurrent()
+    $p = New-Object System.Security.Principal.WindowsPrincipal($id)
+    if ($p.IsInRole([System.Security.Principal.WindowsBuiltInRole]::Administrator))
+    { Write-Output $true }
+    else
+    { Write-Output $false }
+}
+
+if (Confirm-IsElevated)
+{ throw "Webi MUST NOT be run with elevated privileges. Please run again as a normal user, NOT as administrator." }
+
+# this allows us to call ps1 files, which allows us to have spaces in filenames
+# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
+# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
+Set-ExecutionPolicy -Scope Process Bypass
+
+# If a command returns an error, halt the script.
+$ErrorActionPreference = 'Stop'
+
+# Ignore progress events from cmdlets so Invoke-WebRequest is not painfully slow
+$ProgressPreference = 'SilentlyContinue'
+
+$Env:WEBI_HOST = 'https://webinstall.dev'
+#$Env:WEBI_PKG = 'node@lts'
+#$Env:PKG_NAME = node
+#$Env:WEBI_VERSION = v12.16.2
+#$Env:WEBI_GIT_TAG = 12.16.2
+#$Env:WEBI_PKG_URL = "https://.../node-....zip"
+#$Env:WEBI_PKG_FILE = "node-v12.16.2-win-x64.zip"
+#$Env:WEBI_PKG_PATHNAME = "node-v12.16.2-win-x64.zip"
+
+# Switch to userprofile
+Push-Location $Env:USERPROFILE
+
+# Make paths
+New-Item -Path Downloads -ItemType Directory -Force | Out-Null
+New-Item -Path .local\bin -ItemType Directory -Force | Out-Null
+New-Item -Path .local\opt -ItemType Directory -Force | Out-Null
+
+# {{ baseurl }}
+# {{ version }}
+
+function webi_path_add($pathname) {
+    # C:\Users\me => C:/Users/me
+    $my_home = $Env:UserProfile
+    $my_home = $my_home.replace('\\', '/')
+    $my_home_re = [regex]::escape($my_home)
+
+    # ~/bin => %USERPROFILE%/bin
+    $pathname = $pathname.replace('~/', "$Env:UserProfile/")
+
+    # C:\Users\me\bin => %USERPROFILE%/bin
+    $my_pathname = $pathname.replace('\\', '/')
+    $my_pathname = $my_pathname -ireplace $my_home_re, "%USERPROFILE%"
+
+    $all_user_paths = [Environment]::GetEnvironmentVariable("Path", "User")
+    $user_paths = $all_user_paths -Split (';')
+    $exists_in_path = $false
+    foreach ($user_path in $user_paths) {
+        # C:\Users\me\bin => %USERPROFILE%/bin
+        $my_user_path = $user_path.replace('\\', '/')
+        $my_user_path = $my_user_path -ireplace $my_home_re, "%USERPROFILE%"
+
+        if ($my_user_path -ieq $my_pathname) {
+            $exists_in_path = $true
+        }
+    }
+    if (-Not $exists_in_path) {
+        $all_user_paths = $pathname + ";" + $all_user_paths
+        [Environment]::SetEnvironmentVariable("Path", $all_user_paths, "User")
+    }
+
+    $session_paths = $Env:Path -Split (';')
+    $in_session_path = $false
+    foreach ($session_path in $session_paths) {
+        # C:\Users\me\bin => %USERPROFILE%/bin
+        $my_session_path = $session_path.replace('\\', '/')
+        $my_session_path = $my_session_path -ireplace $my_home_re, "%USERPROFILE%"
+
+        if ($my_session_path -ieq $my_pathname) {
+            $in_session_path = $true
+        }
+    }
+
+    if (-Not ($in_session_path)) {
+        webi_path_add_followup $pathname
+    }
+}
+
+function webi_path_add_followup($pathname) {
+    $my_cmd = 'PATH ' + "$pathname" + ';%PATH%'
+    $my_pwsh = '$Env:Path = "' + "$pathname" + ';$Env:Path"'
+
+    Write-Host ''
+    Write-Host '**********************************' -ForegroundColor yellow -BackgroundColor black
+    Write-Host '*      IMPORTANT -- READ ME      *' -ForegroundColor yellow -BackgroundColor black
+    Write-Host '*  (run the PATH command below)  *' -ForegroundColor yellow -BackgroundColor black
+    Write-Host '**********************************' -ForegroundColor yellow -BackgroundColor black
+    Write-Host ''
+    Write-Output ""
+    Write-Output "Copy, paste, and run the appropriate command to update your PATH:"
+    Write-Output "(or close and reopen the terminal, or reboot)"
+    Write-Output ""
+    Write-Output "cmd.exe:"
+    Write-Host "    $my_cmd" -ForegroundColor yellow -BackgroundColor black
+    Write-Output ""
+    Write-Output "PowerShell:"
+    Write-Host "    $my_pwsh" -ForegroundColor yellow -BackgroundColor black
+    Write-Output ""
+}
+
+#$has_local_bin = echo "$Env:PATH" | Select-String -Pattern '\.local.bin'
+#if (!$has_local_bin)
+#{
+webi_path_add ~/.local/bin
+#}
+
+# {{ installer }}
+
+webi_path_add ~/.local/bin
+
+# Done
+Pop-Location

_webi/template.sh

@@ -0,0 +1,675 @@
+#!/bin/sh
+
+__bootstrap_webi() {
+
+    set -e
+    set -u
+    #set -x
+
+    my_libc=''
+    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
+        my_libc=' musl-native'
+    fi
+
+    #WEBI_PKG=
+    #PKG_NAME=
+    #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_GIT_TAG=
+    #WEBI_LTS=
+    #WEBI_CHANNEL=
+    #WEBI_EXT=
+    #WEBI_FORMATS=
+    #WEBI_PKG_URL=
+    #WEBI_PKG_FILE=
+    #WEBI_PKG_PATHNAME=
+    #PKG_OSES=
+    #PKG_ARCHES=
+    #PKG_FORMATS=
+    WEBI_UA="$(uname -s)/$(uname -r) $(uname -m)/unknown${my_libc}"
+    WEBI_PKG_DOWNLOAD=""
+    WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
+    if command -v xdg-user-dir > /dev/null; then
+        WEBI_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)"
+        if [ "${WEBI_DOWNLOAD_DIR}" = "${HOME}" ]; then
+            WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
+        fi
+    fi
+
+    WEBI_PKG_PATH="${WEBI_DOWNLOAD_DIR}/webi/${PKG_NAME:-error}/${WEBI_VERSION:-latest}"
+
+    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 "${WEBI_PKG_PATH}"
+    mkdir -p "$HOME/.local/bin"
+    mkdir -p "$HOME/.local/opt"
+
+    ##
+    ## Detect http client
+    ##
+    set +e
+    WEBI_CURL="$(command -v curl)"
+    export WEBI_CURL
+    WEBI_WGET="$(command -v wget)"
+    export WEBI_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
+
+        if command -v pkg_format_cmd_version > /dev/null; then
+            my_versioned_name="'$(pkg_format_cmd_version "$WEBI_VERSION")'"
+        else
+            my_versioned_name="'$pkg_cmd_name v$WEBI_VERSION'"
+        fi
+
+        echo "$my_versioned_name"
+    }
+
+    # Update symlinks as per $HOME/.local/opt and $HOME/.local/bin install paths.
+    webi_link() {
+        if command -v pkg_link > /dev/null; then
+            pkg_link
+            return 0
+        fi
+
+        if test -n "${WEBI_SINGLE}"; 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
+    }
+
+    # detect if this program is already installed
+    # or if an installed version may cause conflict
+    webi_check_installed() {
+        # Test for existing version
+        set +e
+        my_path="$PATH"
+        PATH="$(dirname "$pkg_dst_cmd"):$PATH"
+        export PATH
+        my_current_cmd="$(command -v "$pkg_cmd_name")"
+        set -e
+        if [ -n "$my_current_cmd" ]; then
+            my_canonical_name="$(_webi_canonical_name)"
+            if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
+                echo >&2 "WARN: possible PATH conflict between $my_canonical_name and currently installed version"
+                echo >&2 "    ${pkg_dst_cmd} (new)"
+                echo >&2 "    ${my_current_cmd} (existing)"
+                #my_current_version=false
+            fi
+            # 'readlink' can't read links in paths on macOS 🤦
+            # but that's okay, 'cmp -s' is good enough for us
+            if cmp -s "${pkg_src_cmd}" "${my_current_cmd}"; then
+                echo "${my_canonical_name} already installed:"
+                my_dst_rel="$(
+                    webi_sub_home "${pkg_dst}"
+                )"
+                printf "    %s" "${my_dst_rel}"
+                if [ "${pkg_src_cmd}" != "${my_current_cmd}" ]; then
+                    my_src_rel="$(
+                        webi_sub_home "${pkg_src}"
+                    )"
+                    printf " => %s" "${my_src_rel}"
+                fi
+                echo ""
+                exit 0
+            fi
+            if [ -x "$pkg_src_cmd" ]; then
+                webi_link
+                echo "switched to $my_canonical_name:"
+                my_src_rel="$(
+                    webi_sub_home "${pkg_src}"
+                )"
+                my_dst_rel="$(
+                    webi_sub_home "${pkg_dst}"
+                )"
+                echo "    ${my_dst_rel} => ${my_src_rel}"
+                exit 0
+            fi
+        fi
+        export PATH="$my_path"
+    }
+
+    webi_check_available() {
+        if test "$WEBI_CHANNEL" != "error"; then
+            return 0
+        fi
+
+        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 ""
+        my_release_url="$(
+            echo "$WEBI_RELEASES" |
+                sed 's:\?.*::'
+        )"
+        echo >&2 "       Double check at ${my_release_url}"
+        echo >&2 ""
+
+        exit 1
+    }
+
+    is_interactive_shell() {
+        # $- shows shell flags (error,unset,interactive,etc)
+        case $- in
+            *i*)
+                # true
+                return 0
+                ;;
+            *)
+                # false
+                return 1
+                ;;
+        esac
+    }
+
+    webi_sub_home() { (
+        my_rel=${HOME}
+        my_abs=${1}
+        echo "${my_abs}" | sed "s:^${my_rel}:~:"
+    ); }
+
+    # detect if file is downloaded, and how to download it
+    webi_download() {
+        my_url="${1}"
+        my_dl="${2}"
+        my_dl_name="${3:-${PKG_NAME}}"
+
+        my_dl_rel="$(
+            webi_sub_home "${my_dl}"
+        )"
+
+        WEBI_PKG_DOWNLOAD="${my_dl}"
+        export WEBI_PKG_DOWNLOAD
+
+        if [ -e "${my_dl}" ]; then
+            echo "Found ${my_dl_rel}"
+            return 0
+        fi
+
+        echo "Downloading ${my_dl_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 is_interactive_shell; then
+                my_show_progress="--show-progress"
+            fi
+            if ! wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"; 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
+            my_show_progress="-#"
+            if is_interactive_shell; then
+                my_show_progress=""
+            fi
+            # shellcheck disable=SC2086
+            # we want the flags to be split
+            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_rel}"
+    }
+
+    webi_git_clone() { (
+        my_url="${1}"
+        my_dl="${2}"
+
+        my_dl_rel="$(
+            webi_sub_home "${my_dl}"
+        )"
+        if [ -e "${my_dl}" ]; then
+            echo "Found ${my_dl_rel}"
+
+            cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
+            return 0
+        fi
+
+        echo "Cloning ${my_url}"
+        cmd_git="git clone --config advice.detachedHead=false --quiet --depth=1 --single-branch"
+        rm -rf "${my_dl}.part"
+        if ! $cmd_git "${my_url}" --branch "${WEBI_GIT_TAG}" "${my_dl}.part"; then
+            echo >&2 "failed to git clone ${WEBI_PKG_URL}"
+            exit 1
+        fi
+        mv "${my_dl}.part" "${my_dl}"
+
+        cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
+    ); }
+
+    # detect which archives can be used
+    webi_extract() {
+        (
+            cd "$WEBI_TMP"
+
+            my_dl_rel="$(
+                webi_sub_home "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+            )"
+            if [ "tar" = "$WEBI_EXT" ]; then
+                echo "Extracting ${my_dl_rel}"
+                tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
+            elif [ "zip" = "$WEBI_EXT" ]; then
+                echo "Extracting ${my_dl_rel}"
+                unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
+            elif [ "exe" = "$WEBI_EXT" ]; then
+                echo "Moving ${my_dl_rel}"
+                mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
+            elif [ "git" = "$WEBI_EXT" ]; then
+                echo "Moving ${my_dl_rel}"
+                mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
+            elif [ "xz" = "$WEBI_EXT" ]; then
+                echo "Inflating ${my_dl_rel}"
+                unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
+            else
+                echo "Failed to extract ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
+                exit 1
+            fi
+        )
+    }
+
+    # use 'pathman' to update $HOME/.config/envman/PATH.env
+    webi_path_add() {
+        my_path="${1}"
+
+        fn_envman_init
+
+        # \v was chosen as it is extremely unlikely for a filename
+        # \1 could be an even better choice, but needs more testing.
+        # (currently tested working on: linux & mac)
+        # "\0001" should also work
+        my_delim="$(
+            printf '\v'
+        )"
+
+        my_path_expanded="$(
+            echo "${my_path}" |
+                sed -e "s${my_delim}\$HOME${my_delim}$HOME${my_delim}g" \
+                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
+                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
+        )"
+
+        # A gift for @adamcstephens.
+        # See https://github.com/webinstall/webi-installers/issues/322
+        case "${PATH}" in
+            # matches whether the first, a middle, the last, or the only PATH entry
+            "${my_path_expanded}":* | \
+                *:"${my_path_expanded}":* | \
+                *:"${my_path_expanded}" | \
+                "${my_path_expanded}")
+
+                if fn_is_defined_in_all_shells "${my_path}"; then
+                    return 0
+                fi
+                ;;
+            *) ;;
+        esac
+
+        my_path_export="$(
+            echo "${my_path}" |
+                sed -e "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g" \
+                    -e "s${my_delim}\${HOME}${my_delim}\$HOME${my_delim}g" \
+                    -e "s${my_delim}^~/${my_delim}\$HOME/${my_delim}g"
+        )"
+
+        my_export="export PATH=\"$my_path_export:\$PATH\""
+        if grep -q -F "${my_export}" ~/.config/envman/PATH.env; then
+            return 0
+        fi
+
+        echo "${my_export}" >> ~/.config/envman/PATH.env
+
+        mkdir -p "$_webi_tmp"
+        my_path_tilde="$(
+            echo "${my_path}" |
+                sed -e "s${my_delim}${HOME}${my_delim}~${my_delim}g"
+        )"
+
+        if ! test -f "$_webi_tmp/.PATH.env" ||
+            ! grep -q -F "${my_path_tilde}" "$_webi_tmp/.PATH.env"; then
+            echo "${my_path_tilde}" >> "$_webi_tmp/.PATH.env"
+        fi
+    }
+
+    fn_envman_init() {
+        mkdir -p ~/.config/envman/
+        if ! test -e ~/.config/envman/PATH.env; then
+            touch ~/.config/envman/PATH.env
+        fi
+
+        if ! test -e ~/.config/envman/load.sh; then
+            # shellcheck disable=SC2016
+            {
+                echo '# Generated for envman. Do not edit.'
+                echo 'for x in ~/.config/envman/*.env; do'
+                echo '    my_basename="$(basename "${x}")"'
+                echo '    if [ "*.env" = "${my_basename}" ]; then'
+                echo '        continue'
+                echo '    fi'
+                echo ''
+                echo '    # shellcheck source=/dev/null'
+                echo '    . "${x}"'
+                echo 'done'
+            } > ~/.config/envman/load.sh
+        fi
+
+        if command -v sh > /dev/null; then
+            if test -e ~/.profile; then
+                if ! grep -q -F '/.config/envman/load.sh' ~/.profile; then
+                    fn_echo_load_sh >> ~/.profile
+                fi
+            fi
+        fi
+        if command -v bash > /dev/null; then
+            if test -e ~/.bashrc; then
+                if ! grep -q -F '/.config/envman/load.sh' ~/.bashrc; then
+                    fn_echo_load_sh >> ~/.bashrc
+                fi
+            fi
+        fi
+        if command -v zsh > /dev/null; then
+            if test -e ~/.zshrc; then
+                if ! grep -q -F '/.config/envman/load.sh' ~/.zshrc; then
+                    fn_echo_load_sh >> ~/.zshrc
+                fi
+            fi
+        fi
+
+        if command -v fish > /dev/null; then
+            if test ! -e ~/.config/envman/load.fish; then
+                # shellcheck disable=SC2016
+                {
+                    echo '# Generated for envman. Do not edit.'
+                    echo 'for x in ~/.config/envman/*.env'
+                    echo '	  source "$x"'
+                    echo 'end'
+                } > ~/.config/envman/load.fish
+            fi
+
+            mkdir -p ~/.config/fish
+            if test -e ~/.config/fish/config.fish; then
+                touch ~/.config/fish/config.fish
+            fi
+            if ! grep -q -F '/.config/envman/load.fish' ~/.config/fish/config.fish; then
+                fn_echo_load_fish >> ~/.config/fish/config.fish
+            fi
+        fi
+    }
+
+    fn_echo_load_fish() {
+        echo ''
+        echo '# Generated for envman. Do not edit.'
+        # shellcheck disable=SC2016
+        echo 'test -s "$HOME/.config/envman/load.fish"; and source "$HOME/.config/envman/load.fish"'
+    }
+
+    fn_echo_load_sh() {
+        echo ''
+        echo '# Generated for envman. Do not edit.'
+        # shellcheck disable=SC2016
+        echo '[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"'
+    }
+
+    fn_is_defined_in_all_shells() {
+        my_path="${1}"
+
+        my_path_expanded="$(
+            echo "${my_path}" |
+                sed -e "s${my_delim}\$HOME|${my_delim}$HOME${my_delim}g" \
+                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
+                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
+        )"
+        my_paths="$(
+            echo "${my_path_expanded}"
+            # $HOME/foo
+            echo "${my_path_expanded}" |
+                sed "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g"
+            # ${HOME}/foo
+            echo "${my_path_expanded}" |
+                sed "s${my_delim}${HOME}${my_delim}\${HOME}${my_delim}g"
+            echo "${my_path}"
+        )"
+
+        my_confs="$(
+            echo "${HOME}/.profile"
+            echo "${HOME}/.bashrc"
+            echo "${HOME}/.zshrc"
+            echo "${HOME}/.config/fish/config.fish"
+        )"
+        for my_conf in $my_confs; do
+            if test -e "${my_conf}"; then
+                if ! grep -q -F "${my_paths}" "${my_conf}"; then
+                    return 1
+                fi
+            fi
+        done
+    }
+
+    # group common pre-install tasks as default
+    webi_pre_install() {
+        webi_check_installed
+        webi_check_available
+        if test "git" = "${WEBI_EXT}"; then
+            webi_git_clone \
+                "${WEBI_PKG_URL}" \
+                "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+            return 0
+        fi
+        webi_download \
+            "${WEBI_PKG_URL}" \
+            "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+        webi_extract
+    }
+
+    # move commands from the extracted archive directory
+    # to $HOME/.local/opt or $HOME/.local/bin
+    webi_install() {
+        if test -n "${WEBI_SINGLE}"; 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() {
+        if test -n "${pkg_no_exec}"; then
+            return 0
+        fi
+
+        webi_path_add "$(dirname "$pkg_dst_cmd")"
+    }
+
+    _webi_enable_exec() {
+        if command -v spctl > /dev/null && command -v xattr > /dev/null; then
+            # note: some packages contain files that cannot be affected by xattr
+            xattr -r -d com.apple.quarantine "$pkg_src" || true
+            return 0
+        fi
+    }
+
+    _webi_done_message() {
+        my_dst_rel="$(
+            webi_sub_home "${pkg_dst_cmd}"
+        )"
+        my_canonical_name="$(
+            _webi_canonical_name
+        )"
+        echo "Installed ${my_canonical_name} as ${my_dst_rel}"
+    }
+
+    ##
+    ##
+    ## BEGIN custom override functions from <package>/install.sh
+    ##
+    ##
+
+    WEBI_SINGLE=
+
+    if [ -z "${WEBI_WELCOME-}" ]; then
+        echo ""
+        printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s/%s\e[0m'.\n" "${WEBI_PKG-}" "$(uname -s)" "$(uname -m)"
+        echo "Have a problem? Experience a bug? Please let us know:"
+        printf "        \e[2m\e[36mhttps://github.com/webinstall/webi-installers/issues\e[0m\n"
+        echo ""
+        printf "\e[35mLovin'\e[0m it? Say thanks with a \e[1m\e[33mStar on GitHub\e[0m:\n"
+        printf "        \e[36mhttps://github.com/webinstall/webi-installers\e[0m\n"
+        echo ""
+    fi
+
+    WEBI_WELCOME=true
+    export WEBI_WELCOME
+
+    __init_installer() {
+        # the installer will be injected here
+        # {{ installer }}
+
+        return 0
+    }
+
+    __init_installer
+
+    ##
+    ##
+    ## END custom override functions
+    ##
+    ##
+
+    # run everything with defaults or overrides as needed
+    if command -v pkg_install > /dev/null ||
+        command -v pkg_link > /dev/null ||
+        command -v pkg_post_install > /dev/null ||
+        command -v pkg_done_message > /dev/null ||
+        command -v pkg_format_cmd_version > /dev/null ||
+        [ -n "${WEBI_SINGLE-}" ] ||
+        [ -n "${pkg_cmd_name-}" ] ||
+        [ -n "${pkg_dst_cmd-}" ] ||
+        [ -n "${pkg_dst_dir-}" ] ||
+        [ -n "${pkg_dst-}" ] ||
+        [ -n "${pkg_src_cmd-}" ] ||
+        [ -n "${pkg_src_dir-}" ] ||
+        [ -n "${pkg_src-}" ]; then
+
+        pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
+
+        pkg_no_exec="${pkg_no_exec:-}"
+
+        if [ -n "${pkg_no_exec}" ]; then
+            pkg_dst_cmd="${pkg_dst}"
+            pkg_src="${pkg_dst}"
+            pkg_src_cmd="${pkg_dst}"
+        elif [ -n "${WEBI_SINGLE}" ]; then
+            pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
+            pkg_dst="$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"
+        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
+        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
+        pkg_src_bin="$(dirname "$pkg_src_cmd")"
+        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
+        pkg_dst_bin="$(dirname "$pkg_dst_cmd")"
+
+        if command -v pkg_pre_install > /dev/null; then pkg_pre_install; else webi_pre_install; fi
+
+        (
+            cd "$WEBI_TMP"
+            my_src_rel="$(
+                webi_sub_home "${pkg_src_cmd}"
+            )"
+            if test -e "${pkg_src_cmd}"; then
+                echo "Found ${my_src_rel} (remove to force reinstall)"
+            else
+                echo "Installing to ${my_src_rel}"
+                if command -v pkg_install > /dev/null; then pkg_install; else webi_install; fi
+                chmod a+x "$pkg_src"
+                chmod a+x "$pkg_src_cmd"
+            fi
+        )
+
+        if test -z "${pkg_no_exec}"; then
+            webi_link
+            _webi_enable_exec
+        fi
+        (
+            cd "$WEBI_TMP"
+            if command -v pkg_post_install > /dev/null; then pkg_post_install; else webi_post_install; fi
+        )
+
+        (
+            cd "$WEBI_TMP"
+            if command -v pkg_done_message > /dev/null; then pkg_done_message; else _webi_done_message; fi
+        )
+
+        echo ""
+    fi
+
+    webi_path_add "$HOME/.local/bin"
+    if [ -z "${_WEBI_CHILD-}" ] && [ -f "$_webi_tmp/.PATH.env" ]; then
+        if test -s "$_webi_tmp/.PATH.env"; then
+            printf 'PATH.env updated with:\n'
+            sort -u "$_webi_tmp/.PATH.env" | while read -r my_new_path; do
+                echo "        ${my_new_path}"
+            done
+            printf "\n"
+
+            rm -f "$_webi_tmp/.PATH.env"
+
+            printf "\e[1m\e[35mTO FINISH\e[0m: copy, paste & run the following command:\n"
+            printf "\n"
+            printf "        \e[1m\e[32msource ~/.config/envman/PATH.env\e[0m\n"
+            printf "        (newly opened terminal windows will update automatically)\n"
+        fi
+    fi
+
+    rm -rf "$WEBI_TMP"
+}
+
+__bootstrap_webi

_webi/test.js

@@ -33,8 +33,7 @@ var os = require('os');
 var fs = require('fs');
 var path = require('path');
 var Releases = require('./releases.js');
-var ServeInstaller = require('./serve-installer.js');
-
+var uaDetect = require('./ua-detect.js');
 var pkg = process.argv[2].split('@');
 var pkgdir = pkg[0];
 var pkgtag = pkg[1] || '';
@@ -43,7 +42,6 @@ var nodes = fs.readdirSync(pkgdir);
 nodes.forEach(function (node) {
   nodesMap[node] = true;
 });
-var baseurl = 'https://webinstall.dev';
 
 var maxLen = 0;
 console.info('');
@@ -64,60 +62,90 @@ console.info('Has the necessary files?');
   });
 
 console.info('');
-Releases.get(path.join(process.cwd(), pkgdir)).then(async function (all) {
+Releases.get(path.join(process.cwd(), pkgdir)).then(function (all) {
   var pkgname = path.basename(pkgdir.replace(/\/$/, ''));
-  var nodeOs = os.platform();
-  var nodeOsRelease = os.release();
-  var nodeArch = os.arch();
-  var nodeLibc = 'libc';
-  if (process.platform === 'linux') {
-    nodeLibc = 'gnu';
-    let isUnofficial =
-      process.config.variables.node_release_urlbase.includes('unofficial');
-    if (isUnofficial) {
-      nodeLibc = 'musl';
-    }
-  }
+  var osrel = os.platform() + '-' + os.release();
+  var arch = os.arch();
   var formats = ['exe', 'xz', 'tar', 'zip', 'git'];
 
-  let [rel, opts] = await ServeInstaller.helper({
-    ua: `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`,
-    pkg: pkgname,
-    tag: pkgtag || '',
-    formats: formats,
-    libc: nodeLibc,
-  });
-  Object.assign(
-    {
-      ver: '',
-      lts: null,
-      channel: '',
-      os: '',
-      arch: '',
-      limit: 0,
-    },
-    opts,
-    {
-      baseurl,
-    },
-  );
+  var rel;
+  //var releases = [];
+  for (let _rel of all.releases) {
+    for (let ext of formats) {
+      let isSupported = _rel.ext.match(ext);
+      if (!isSupported) {
+        continue;
+      }
+    }
+
+    if (_rel.channel !== 'stable') {
+      continue;
+    }
+
+    if (_rel.os !== '*') {
+      let curOs = uaDetect.os(osrel);
+      if (_rel.os !== curOs) {
+        continue;
+      }
+    }
+
+    if (_rel.arch !== '*') {
+      let curArch = uaDetect.arch(arch);
+      if (_rel.arch !== curArch) {
+        continue;
+      }
+    }
+
+    if (pkgtag) {
+      if (_rel.tag !== pkgtag) {
+        let pkgtagRe = new RegExp('^' + pkgtag);
+        let matchesVersion = pkgtagRe.test(_rel.version);
+        if (!matchesVersion) {
+          continue;
+        }
+      }
+    }
+
+    rel = _rel;
+    break;
+  }
 
   if (!rel) {
     console.error(
-      `Error: ❌ no release found for @${pkgtag}?os=${nodeOs}&arch=${nodeArch}&libc=${nodeLibc}&formats=${formats}`,
+      `Error: ❌ no release found for os=${osrel}, arch=${arch}, and tag=${pkgtag}`,
     );
     process.exit(1);
     return;
   }
 
+  rel.oses = all.oses;
+  rel.arches = all.arches;
+  rel.formats = all.formats;
+
   console.info('');
   console.info('Found release matching current os, arch, and tag:');
   console.info(rel);
   console.info('');
 
   return Promise.all([
-    Releases.renderBash(pkgdir, rel, opts).catch(function () {}),
-    Releases.renderPowerShell(pkgdir, rel, opts).catch(function () {}),
+    Releases.renderBash(pkgdir, rel, {
+      baseurl: 'https://webinstall.dev',
+      pkg: pkgname,
+      tag: pkgtag || '',
+      ver: '',
+      os: osrel,
+      arch,
+      formats: formats,
+    }).catch(function () {}),
+    Releases.renderPowerShell(pkgdir, rel, {
+      baseurl: 'https://webinstall.dev',
+      pkg: pkgname,
+      tag: pkgtag || '',
+      ver: '',
+      os: osrel,
+      arch,
+      formats: formats,
+    }).catch(function () {}),
   ]).then(function (scripts) {
     var bashTxt = scripts[0];
     var ps1Txt = scripts[1];
@@ -141,9 +169,5 @@ Releases.get(path.join(process.cwd(), pkgdir)).then(async function (all) {
       console.info('\tNEEDS MANUAL TEST: powershell.exe %s', ps1File);
     }
     console.info('');
-    setTimeout(function () {
-      console.warn(`[warn] dangling event loop handle`);
-      process.exit(0);
-    }, 300).unref();
   });
 });

_webi/transform-releases.js

@@ -2,6 +2,7 @@
 
 var path = require('path');
 var Releases = require('./releases.js');
+var uaDetect = require('./ua-detect.js');
 
 var cache = {};
 //var staleAge = 5 * 1000;
@@ -53,14 +54,21 @@ function createFormatsSorter(formats) {
       return 1;
     }
 
-    // rank builds that don't depend on any form of libc first
-    if (a.libc === 'none' && b.libc !== 'none') {
-      return -1;
-    }
-    if (a.libc !== 'none' && b.libc === 'none') {
+    // Hacky-doo for musl-native: prefer non-musl
+    if (a._musl_native && !b._musl_native) {
       return 1;
     }
+    if (!a._musl_native && b._musl_native) {
+      return -1;
+    }
 
+    // Hacky-doo for linux: prefer musl
+    if (a._musl && !b._musl) {
+      return -1;
+    }
+    if (!a._musl && b._musl) {
+      return 1;
+    }
     return 0;
   };
 }
@@ -189,20 +197,13 @@ async function filterReleases(
       }
     }
 
-    if (rel.libc !== 'none') {
-      let releaseRequiresMusl = rel.libc === 'musl';
-      // goal: handle non-glibc (Alpine / Docker / musl)
-      let osHasMusl = libc === 'musl';
-      if (osHasMusl) {
-        // goal: fail if dependent on libc
-        let releaseRequiresLibc = rel.libc === 'gnu';
-        if (releaseRequiresLibc) {
-          return false;
-        }
-      } else if (releaseRequiresMusl) {
-        // goal: don't use musl++ on glibc (Ubuntu, GNU, etc)
+    // Hacky-doo for linux musl
+    if (libc === uaDetect.MUSL_NATIVE) {
+      if (!rel._musl && !rel._musl_native) {
         return false;
       }
+    } else if (rel._musl_native) {
+      return false;
     }
 
     if (lts) {
@@ -278,16 +279,7 @@ module.exports = function getReleases({
         console.error(err);
       })
       .then(function (releases) {
-        if (releases.length) {
-          return {
-            oses: all.oses,
-            arches: all.arches,
-            libcs: all.libcs,
-            formats: all.formats,
-            releases: releases,
-          };
-        }
-        if (_count < 1) {
+        if (!releases.length) {
           // Apple Silicon M1 hacky-do workaround fix
           if ('macos' === os && 'arm64' === arch) {
             return getReleases({
@@ -316,7 +308,23 @@ module.exports = function getReleases({
               limit,
             });
           }
+          // Raspberry Pi 3+ on Raspbian x86 (not Ubuntu arm64)
+          if (!_count && 'linux' === os && 'armv7l' === arch) {
+            return getReleases({
+              _count: _count + 1,
+              pkg,
+              ver,
+              os,
+              arch: 'arm64',
+              libc,
+              lts,
+              channel,
+              formats,
+              limit,
+            });
+          }
           // Raspberry Pi 3+ on Ubuntu arm64 (via Bionic?)
+          // (this may be the same as the prior search, that's okay)
           if ('linux' === os && 'arm64' === arch) {
             return getReleases({
               _count: _count + 1,
@@ -331,7 +339,7 @@ module.exports = function getReleases({
               limit,
             });
           }
-          // armv7 can run armv6
+          // Raspberry Pi 3+ on Ubuntu arm64 (via Bionic?)
           if ('linux' === os && 'armv7l' === arch) {
             return getReleases({
               _count: _count + 1,
@@ -346,47 +354,29 @@ module.exports = function getReleases({
               limit,
             });
           }
+          releases = [
+            {
+              name: 'doesntexist.ext',
+              version: '0.0.0',
+              lts: '-',
+              channel: 'error',
+              date: '1970-01-01',
+              os: os || '-',
+              arch: arch || '-',
+              _musl: undefined,
+              _musl_native: undefined,
+              ext: 'err',
+              download: 'https://example.com/doesntexist.ext',
+              comment:
+                'No matches found. Could be bad or missing version info' +
+                ',' +
+                "Check query parameters. Should be something like '/api/releases/{package}@{version}.tab?os={macos|linux|windows|-}&arch={amd64|x86|aarch64|arm64|armv7l|-}&limit=100'",
+            },
+          ];
         }
-        if (_count < 2) {
-          // Raspberry Pi 3+ on Raspbian arm7 (not Ubuntu arm64)
-          // hail mary
-          if ('linux' === os && 'armv7l' === arch) {
-            return getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'arm64',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-        }
-        releases = [
-          {
-            name: 'doesntexist.ext',
-            version: '0.0.0',
-            lts: '-',
-            channel: 'error',
-            date: '1970-01-01',
-            os: os || '-',
-            arch: arch || '-',
-            libc: libc || '-',
-            ext: 'err',
-            download: 'https://example.com/doesntexist.ext',
-            comment:
-              'No matches found. Could be bad or missing version info' +
-              ',' +
-              "Check query parameters. Should be something like '/api/releases/{package}@{version}.tab?os={macos|linux|windows|-}&arch={amd64|x86|aarch64|arm64|armv7l|-}&libc={musl|gnu|msvc|libc|static}&limit=10'",
-          },
-        ];
         return {
           oses: all.oses,
           arches: all.arches,
-          libcs: all.libcs,
           formats: all.formats,
           releases: releases,
         };
@@ -402,7 +392,7 @@ if (require.main === module) {
       os: 'macos',
       arch: 'amd64',
       lts: true,
-      libc: 'libc',
+      libc: '',
       channel: 'stable',
       formats: ['tar', 'exe', 'zip', 'xz', 'dmg', 'pkg'],
       limit: 10,

_webi/ua-detect.js

@@ -2,6 +2,10 @@
 
 var uaDetect = module.exports;
 
+const MUSL_NATIVE = 'musl-native';
+
+uaDetect.MUSL_NATIVE = MUSL_NATIVE;
+
 function getRequest(req) {
   var ua = req.headers['user-agent'] || '';
   var os = req.query.os;
@@ -67,9 +71,9 @@ function getArch(ua) {
 
   if (/aarch64|arm64|arm8|armv8/i.test(ua)) {
     return 'arm64';
-  } else if (/aarch|arm7|armv7|arm32/i.test(ua)) {
+  } else if (/aarch|arm7|armv7/i.test(ua)) {
     return 'armv7l';
-  } else if (/arm6|armv6|arm(\b|_)/i.test(ua)) {
+  } else if (/arm6|armv6/i.test(ua)) {
     return 'armv6l';
   } else if (/ppc64le/i.test(ua)) {
     return 'ppc64le';
@@ -96,55 +100,19 @@ function getLibc(ua) {
     return '-';
   }
 
-  // How to see a bunch of target host quadruples:
-  //     go tool dist list
-  //     rustup target list
-  //     zig targets | jq -r '.libc[]' | sort -
-
+  // Use native 'libc' information, if provided
+  //
   // Generally, we prefer 'musl' builds because they DO work on glibc systems (Ubuntu),
   // but 'glibc' builds will NOT work on musl systems (Alpine / Docker).
   //
   // However, there are a few instances (ex: Node.js), where the 'musl' builds
   // DO NOT work on glibc systems.
-
-  {
-    let muslRe = /(\b|_)(musl)(\b|_)/i;
-    if (muslRe.test(ua)) {
-      return 'musl';
-    }
+  if (ua.match(MUSL_NATIVE)) {
+    return MUSL_NATIVE;
   }
 
-  {
-    let msvcRe = /(\b|_)(msvc|windows|microsoft)(\b|_)/i;
-    if (msvcRe.test(ua)) {
-      return 'msvc';
-    }
-  }
-
-  {
-    let gnuRe = /(\b|_)(gnu|glibc|linux)(\b|_)/i;
-    if (gnuRe.test(ua)) {
-      return 'gnu';
-    }
-  }
-
-  {
-    let libcRe = /(\b|_)(libc)(\b|_)/i;
-    if (libcRe.test(ua)) {
-      return 'libc';
-    }
-  }
-
-  {
-    let darwinRe = /(\b|_)(darwin)(\b|_)/i;
-    if (darwinRe.test(ua)) {
-      // not sure whether this should be "darwin" or "libc" or "none"
-      // https://opensource.apple.com/source/Libc/
-      return 'libc';
-    }
-  }
-
-  return 'libc';
+  // TODO handle explicit invalid different
+  return '';
 }
 
 uaDetect.os = getOs;

_webi/webi-pwsh.ps1

@@ -0,0 +1,112 @@
+#!/usr/bin/env pwsh
+
+# this allows us to call ps1 files, which allows us to have spaces in filenames
+# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
+# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
+Set-ExecutionPolicy -Scope Process Bypass
+
+# If a command returns an error, halt the script.
+$ErrorActionPreference = 'Stop'
+
+# Ignore progress events from cmdlets so Invoke-WebRequest is not painfully slow
+$ProgressPreference = 'SilentlyContinue'
+
+# This is the canonical CPU arch when the process is emulated
+$my_arch = "$Env:PROCESSOR_ARCHITEW6432"
+IF ($my_arch -eq $null -or $my_arch -eq "") {
+    # This is the canonical CPU arch when the process is native
+    $my_arch = "$Env:PROCESSOR_ARCHITECTURE"
+}
+IF ($my_arch -eq "AMD64") {
+    # Because PowerShell isn't ARM yet.
+    # See https://oofhours.com/2020/02/04/powershell-on-windows-10-arm64/
+    $my_os_arch = wmic os get osarchitecture
+
+    # Using -clike because of the trailing newline
+    IF ($my_os_arch -clike "ARM 64*") {
+        $my_arch = "ARM64"
+    }
+}
+
+$Env:WEBI_UA = "Windows/10 $my_arch"
+$exename = $args[0]
+
+# Switch to userprofile
+Push-Location $Env:USERPROFILE
+
+# Make paths if needed
+New-Item -Path .local\bin -ItemType Directory -Force | Out-Null
+# TODO replace all xbin with opt\bin\
+New-Item -Path .local\xbin -ItemType Directory -Force | Out-Null
+
+# See note on Set-ExecutionPolicy above
+Set-Content -Path .local\bin\webi.bat -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\webi-pwsh.ps1 %1`r`npopd"
+# Backwards-compat bugfix: remove old webi-pwsh.ps1 location
+Remove-Item -Path .local\bin\webi.ps1 -Recurse -ErrorAction Ignore
+if (!(Test-Path -Path .local\opt)) {
+    New-Item -Path .local\opt -ItemType Directory -Force | Out-Null
+}
+# TODO windows version of mktemp -d
+if (!(Test-Path -Path .local\tmp)) {
+    New-Item -Path .local\tmp -ItemType Directory -Force | Out-Null
+}
+
+# TODO SetStrictMode
+# TODO Test-Path variable:global:Env:WEBI_HOST ???
+IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") {
+    $Env:WEBI_HOST = "https://webinstall.dev"
+}
+
+# {{ baseurl }}
+# {{ version }}
+
+$my_version = 'v1.1.15'
+
+## show help if no params given or help flags are used
+if ($null -eq $exename -or $exename -eq "-h" -or $exename -eq "--help" -or $exename -eq "help" -or $exename -eq "/?") {
+    Write-Host "webi " -ForegroundColor Green -NoNewline; Write-Host "$my_version " -ForegroundColor Red -NoNewline; Write-Host "Copyright 2020+ AJ ONeal"
+    Write-Host "  https://webinstall.dev/webi" -ForegroundColor blue
+    Write-Output ""
+    Write-Output "SUMMARY"
+    Write-Output "    Webi is the best way to install the modern developer tools you love."
+    Write-Output "    It's fast, easy-to-remember, and conflict free."
+    Write-Output ""
+    Write-Output "USAGE"
+    Write-Output "    webi <thing1>[@version] [thing2] ..."
+    Write-Output ""
+    Write-Output "UNINSTALL"
+    Write-Output "    Almost everything that is installed with webi is scoped to"
+    Write-Output "    ~/.local/opt/<thing1>, so you can remove it like so:"
+    Write-Output ""
+    Write-Output "    rmdir /s %USERPROFILE%\.local\opt\<thing1>"
+    Write-Output "    del %USERPROFILE%\.local\bin\<thing1>"
+    Write-Output ""
+    Write-Output "    Some packages have special uninstall instructions, check"
+    Write-Output "    https://webinstall.dev/<thing1> to be sure."
+    Write-Output ""
+    Write-Output "FAQ"
+    Write-Host "    See " -NoNewline; Write-Host "https://webinstall.dev/faq" -ForegroundColor blue
+    Write-Output ""
+    Write-Output "ALWAYS REMEMBER"
+    Write-Output "    Friends don't let friends use brew for simple, modern tools that don't need it."
+    exit 0
+}
+
+if ($exename -eq "-V" -or $exename -eq "--version" -or $exename -eq "version" -or $exename -eq "/v") {
+    Write-Host "webi " -ForegroundColor Green -NoNewline; Write-Host "$my_version " -ForegroundColor Red -NoNewline; Write-Host "Copyright 2020+ AJ ONeal"
+    Write-Host "  https://webinstall.dev/webi" -ForegroundColor blue
+    exit 0
+}
+
+# Fetch <whatever>.ps1
+# TODO detect formats
+$PKG_URL = "$Env:WEBI_HOST/api/installers/$exename.ps1?formats=zip,exe,tar,git"
+Write-Output "Downloading $PKG_URL"
+# Invoke-WebRequest -UserAgent "Windows amd64" "$PKG_URL" -OutFile ".\.local\tmp\$exename.install.ps1"
+& curl.exe -fsSL -A "$Env:WEBI_UA" "$PKG_URL" -o .\.local\tmp\$exename.install.ps1
+
+# Run <whatever>.ps1
+powershell .\.local\tmp\$exename.install.ps1
+
+# Done
+Pop-Location

_webi/webi.bat

@@ -0,0 +1,27 @@
+@echo off
+pushd "%userprofile%" || goto :error
+  IF NOT EXIST .local (
+    mkdir .local || goto :error
+  )
+  IF NOT EXIST .local\bin (
+    mkdir .local\bin || goto :error
+  )
+  IF NOT EXIST .local\opt (
+    mkdir .local\opt || goto :error
+  )
+
+  echo Downloading and installing %1
+  powershell $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest https://webinstall.dev/packages/%1/install.ps1 -OutFile %1-webinstall.bat || goto :error
+
+  rem TODO only add if it's not in there already
+  PATH .local\bin;%PATH%
+
+  call %1-webinstall.bat || goto :error
+  del %1-webinstall.bat || goto :error
+popd
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

_webi/webi.ps1.bat

@@ -0,0 +1 @@
+powershell -ExecutionPolicy Bypass .\.local\bin\webi-pwsh.ps1 %1

aliasman/releases.js

@@ -17,7 +17,6 @@ module.exports = function (request) {
   ];
   let oses = ['freebsd', 'linux', 'macos', 'posix'];
   return githubSource(request, owner, repo, oses, arches).then(function (all) {
-    all._names = ['aliasman', 'legacy'];
     return all;
   });
 };

arc/releases.js

@@ -6,7 +6,6 @@ var repo = 'archiver';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['archiver', 'arc'];
     return all;
   });
 };

archiver/install.ps1

@@ -2,4 +2,4 @@
 
 Write-Output "'archiver@$Env:WEBI_TAG' is an alias for 'arc@$Env:WEBI_VERSION'"
 IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
-curl.exe -A MS -fsSL "$Env:WEBI_HOST/arc@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/arc@$Env:WEBI_VERSION" | powershell

atomicparsley/releases.js

@@ -8,13 +8,10 @@ let targets = {
   x86win: {
     os: 'windows',
     arch: 'x86',
-    libc: 'msvc',
   },
   x64win: {
     os: 'windows',
     arch: 'amd64',
-    // https://github.com/wez/atomicparsley/issues/6#issuecomment-1364523028
-    libc: 'msvc',
   },
   x64mac: {
     os: 'macos',
@@ -23,12 +20,11 @@ let targets = {
   x64lin: {
     os: 'linux',
     arch: 'amd64',
-    libc: 'gnu',
   },
   x64musl: {
     os: 'linux',
     arch: 'amd64',
-    libc: 'musl',
+    _musl_native: true,
   },
 };
 
@@ -65,7 +61,6 @@ module.exports = function (request) {
         continue;
       }
     }
-    all._names = ['AtomicParsley', 'atomicparsley'];
     return all;
   });
 };

bat/install.ps1

@@ -15,7 +15,7 @@ IF (-not (Test-Path "\Windows\System32\vcruntime140.dll")) {
     & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" vcruntime
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
     Write-Output "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
@@ -35,13 +35,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
 
     # Settle unpacked archive into place
     Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\bin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin"
+    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
     Pop-Location
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\bin\$VERNAME'"
+Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse
+Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

bat/install.sh

@@ -19,7 +19,7 @@ __init_bat() {
     }
 
     pkg_install() {
-        # ~/.local/bin
+        # ~/.local/xbin
         mkdir -p "$pkg_src_bin"
 
         # mv ./bat-*/bat ~/.local/opt/bat-v0.15.4/bin/bat

bun/releases.js

@@ -8,17 +8,10 @@ module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     all.releases = all.releases
       .filter(function (r) {
-        let isDebug = r.name.includes('-profile');
-        if (isDebug) {
-          return false;
+        let isDebug = /-profile/.test(r.name);
+        if (!isDebug) {
+          return true;
         }
-
-        let isAncient = r.name.includes('-baseline');
-        if (isAncient) {
-          return false;
-        }
-
-        return true;
       })
       .map(function (r) {
         // bun-v0.5.1 => v0.5.1

caddy/README.md

@@ -847,7 +847,7 @@ sudo serviceman add --system --name caddy -- \
    You can do this with _PowerShell_ by changing `YOUR_USER` in the script below
    and running it in `cmd.exe` as Administrator:
    ```pwsh
-   powershell.exe -WindowStyle Hidden -Command $r = Get-NetFirewallRule -DisplayName 'Caddy Web Server' 2> $null; if ($r) {write-host 'found rule';} else {New-NetFirewallRule -DisplayName 'Caddy Web Server' -Direction Inbound $HOME\\.local\\bin\\caddy.exe -Action Allow}
+   powershell.exe -WindowStyle Hidden -Command $r = Get-NetFirewallRule -DisplayName 'Caddy Web Server' 2> $null; if ($r) {write-host 'found rule';} else {New-NetFirewallRule -DisplayName 'Caddy Web Server' -Direction Inbound C:\\Users\\YOUR_USER\\.local\\bin\\caddy.exe -Action Allow}
    ```
 2. Install [`serviceman`](../serviceman/)
    ```sh

caddy/releases.js

@@ -8,12 +8,7 @@ module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      let isOneOffAsset = rel.download.includes('buildable-artifact');
-      if (isOneOffAsset) {
-        return false;
-      }
-
-      return true;
+      return !/(\.txt)|(\.deb)$/i.test(rel.name);
     });
     return all;
   });

chromedriver/install.sh

@@ -20,28 +20,20 @@ __init_chromedriver() {
 
     # pkg_install must be defined by every package
     pkg_install() {
-        # ~/.local/opt/chromedriver-v121.0.6130.0/bin
+        # ~/.local/opt/chromedriver-v88.0.4324.96/bin
         mkdir -p "$(dirname "$pkg_src_cmd")"
 
-        # mv ./chromedriver-macos-arm64/chromedriver \
-        #     ~/.local/opt/chromedriver-v121.0.6130.0/bin/chromedriver
-        mv ./chromedriver-*/chromedriver "$pkg_src_cmd"
-
-        echo ""
-        echo "    $(t_warn 'MANUAL STEPS TO FINISH:') you may need to install libnss3:"
-        echo "        $(t_cmd 'sudo apt install -y') $(t_warn 'libnss3')"
+        # mv ./chromedriver-*/chromedriver ~/.local/opt/chromedriver-v88.0.4324.96/bin/chromedriver
+        mv ./chromedriver* "$pkg_src_cmd"
     }
 
     # pkg_get_current_version is recommended, but (soon) not required
     pkg_get_current_version() {
         # 'chromedriver --version' has output in this format:
-        #       ChromeDriver 121.0.6130.0 (5fc19c7ab5e88bb674c2efc65db4b7890a52a4ec-refs/branch-heads/6130@{#1})
+        #       ChromeDriver 88.0.4324.96 (68dba2d8a0b149a1d3afac56fa74648032bcf46b-refs/branch-heads/4324@{#1784})
         # This trims it down to just the version number:
-        #       121.0.6130.0
-        chromedriver --version 2> /dev/null |
-            head -n 1 |
-            tr -s ' ' |
-            cut -d' ' -f2
+        #       88.0.4324.96
+        chromedriver --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2
     }
 
 }

chromedriver/releases.js

@@ -1,77 +1,81 @@
 'use strict';
 
-// See <https://googlechromelabs.github.io/chrome-for-testing/>
-var releaseApiUrl =
-  'https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json';
+var matchers = {
+  key: /.*Key>(.*)<\/Key.*/,
+  generation: /.*Generation>(.*)<\/Generation.*/,
+  metaGeneration: /.*MetaGeneration>(.*)<\/MetaGeneration.*/,
+  lastModified: /.*LastModified>(.*)<\/LastModified.*/,
+  etag: /.*ETag>(.*)<\/ETag.*/,
+  size: /.*Size>(.*)<\/Size.*/,
+};
+var baseUrl = 'https://chromedriver.storage.googleapis.com';
 
-// {
-//   "timestamp": "2023-11-15T21:08:56.730Z",
-//   "versions": [
-//     {
-//       "version": "121.0.6120.0",
-//       "revision": "1222902",
-//       "downloads": {
-//         "chrome": [],
-//         "chromedriver": [
-//           {
-//             "platform": "linux64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/linux64/chromedriver-linux64.zip"
-//           },
-//           {
-//             "platform": "mac-arm64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/mac-arm64/chromedriver-mac-arm64.zip"
-//           },
-//           {
-//             "platform": "mac-x64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/mac-x64/chromedriver-mac-x64.zip"
-//           },
-//           {
-//             "platform": "win32",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/win32/chromedriver-win32.zip"
-//           },
-//           {
-//             "platform": "win64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/win64/chromedriver-win64.zip"
-//           }
-//         ],
-//         "chrome-headless-shell": []
-//       }
-//     }
-//   ]
-// }
-
-module.exports = async function (request) {
-  let resp = await request({
-    url: releaseApiUrl,
-    json: true,
-  });
-
-  let builds = [];
-  for (let release of resp.body.versions) {
-    if (!release.downloads.chromedriver) {
-      continue;
-    }
-
-    let version = release.version;
-    for (let asset of release.downloads.chromedriver) {
-      let build = {
-        version: version,
-        download: asset.url,
-        // I' not sure that this is actually statically built but it
-        // seems to be and at worst we'll just get bug reports for Apline
-        libc: 'none',
-      };
-
-      builds.push(build);
-    }
-  }
-
-  let all = {
+module.exports = function (request) {
+  var all = {
     download: '',
-    releases: builds,
+    releases: [],
   };
 
-  return all;
+  // XML
+  return request({
+    url: 'https://chromedriver.storage.googleapis.com/',
+    json: false,
+  })
+    .then(function (resp) {
+      var body = resp.body;
+      var groups = body.split(/<\/?Contents>/g);
+      // get rid of leading and trailing junk
+      groups.shift();
+      groups.pop();
+      var metas = groups.map(function (group) {
+        return {
+          key: group.replace(matchers.key, '$1'),
+          //generation: group.replace(matchers.generation, '$1'),
+          //metaGeneration: group.replace(matchers.metaGeneration, '$1'),
+          lastModified: group.replace(matchers.lastModified, '$1'),
+          //etag: group.replace(matchers.etag, '$1'),
+          //size: group.replace(matchers.size, '$1')
+        };
+      });
+      all.download = baseUrl + '/{{ download }}';
+      metas.forEach(function (asset) {
+        if (!asset.key.includes('chromedriver')) {
+          // skip the indexes, images, etc
+          return null;
+        }
+
+        var osname = asset.key.replace(/.*(win|mac|linux)/, '$1');
+        var arch;
+        if (asset.key.includes('linux')) {
+          osname = 'linux';
+        } else if (asset.key.includes('mac64')) {
+          osname = 'macos';
+          if (asset.key.includes('_m1.')) {
+            arch = 'arm64';
+          }
+        } else if (asset.key.includes('win')) {
+          osname = 'windows';
+          arch = 'amd64';
+        }
+        all.releases.push({
+          // 87.0.4280.88/chromedriver_win32.zip => 87.0.4280.88
+          version: asset.key.replace(/(.*)\/.*/, '$1'),
+          lts: false,
+          channel: 'stable',
+          date: asset.lastModified.replace(/T.*/, '$1'),
+          os: osname,
+          arch: arch,
+          hash: '-', // not sure about including etag as hash yet
+          download: asset.key,
+        });
+      });
+    })
+    .then(function () {
+      all.releases.sort(function (a, b) {
+        return new Date(b.date).valueOf() - new Date(a.date).valueOf();
+      });
+      return all;
+    });
 };
 
 if (module === require.main) {

cmake/install.ps1

@@ -8,19 +8,19 @@
 $pkg_cmd_name = "cmake"
 
 $pkg_dst_cmd = "$Env:USERPROFILE\.local\opt\cmake\bin\cmake.exe"
-$pkg_dst_bin = "$Env:USERPROFILE\.local\opt\cmake\bin"
 $pkg_dst_dir = "$Env:USERPROFILE\.local\opt\cmake"
-$pkg_dst = "$pkg_dst_dir"
+$pkg_dst = "$pkg_dst_cmd"
 
 $pkg_src_cmd = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION\bin\cmake.exe"
+$pkg_src_bin = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_dir"
+$pkg_src = "$pkg_src_cmd"
 
 New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
 $pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$pkg_download")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     Write-Output "Downloading cmake from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
     & Move-Item "$pkg_download.part" "$pkg_download"
@@ -49,8 +49,6 @@ IF (!(Test-Path -Path "$pkg_src_dir")) {
     Pop-Location
 }
 
-Write-Output "Copying into '$pkg_dst' from '$pkg_src'"
-Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore | Out-Null
+Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
-webi_path_add "$pkg_dst_bin"
-& "$pkg_dst_cmd" --version

cmake/releases.js

@@ -6,39 +6,6 @@ var repo = 'CMake';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    for (let rel of all.releases) {
-      if (rel.version.startsWith('v')) {
-        rel._version = rel.version.slice(1);
-      }
-
-      {
-        let linuxRe = /(\b|_)(linux|gnu)(\b|_)/i;
-        let isLinux = linuxRe.test(rel.download) || linuxRe.test(rel.name);
-
-        if (isLinux) {
-          let muslRe = /(\b|_)(musl|alpine)(\b|_)/i;
-          let isMusl = muslRe.test(rel.download) || muslRe.test(rel.name);
-          if (isMusl) {
-            rel.libc = 'musl';
-          } else {
-            rel.libc = 'gnu';
-          }
-          continue;
-        }
-      }
-
-      {
-        let windowsRe = /(\b|_)(win\d*|windows\d*)(\b|_)/i;
-        let isWindows =
-          windowsRe.test(rel.download) || windowsRe.test(rel.name);
-
-        if (isWindows) {
-          rel.libc = 'msvc';
-          continue;
-        }
-      }
-    }
-
     return all;
   });
 };

comrak/releases.js

@@ -4,28 +4,8 @@ var github = require('../_common/github.js');
 var owner = 'kivikakk';
 var repo = 'comrak';
 
-var ODDITIES = ['-musleabihf.1-'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    loopBuilds: for (let build of all.releases) {
-      let isOddity;
-      for (let oddity of ODDITIES) {
-        isOddity = build.name.includes(oddity);
-        if (isOddity) {
-          break;
-        }
-      }
-      if (isOddity) {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

curlie/install.ps1

@@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
     Write-Output "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
@@ -29,13 +29,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
 
     # Settle unpacked archive into place
     Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\bin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin"
+    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
     Pop-Location
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\bin\$VERNAME'"
+Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse
+Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

curlie/install.sh

@@ -19,7 +19,7 @@ __init_curlie() {
     }
 
     pkg_install() {
-        # $HOME/.local/bin
+        # $HOME/.local/xbin
         mkdir -p "$pkg_src_bin"
 
         # mv ./curlie* "$HOME/.local/opt/curlie-v1.3.1/bin/curlie"

curlie/releases.js

@@ -6,7 +6,6 @@ var repo = 'curlie';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['curlie', 'curl-httpie'];
     return all;
   });
 };

dashcore/releases.js

@@ -6,17 +6,14 @@ var repo = 'dash';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
+    all.releases = all.releases.filter(function (rel) {
+      return !rel.name.endsWith('.asc');
+    });
     all.releases.forEach(function (rel) {
       if (rel.name.includes('osx64')) {
         rel.os = 'macos';
       }
-
-      if (rel.version.startsWith('v')) {
-        rel._version = rel.version.slice(1);
-      }
     });
-
-    all._names = ['dashd', 'dashcore'];
     return all;
   });
 };

deno/install.sh

@@ -23,13 +23,13 @@ pkg_get_current_version() {
 }
 
 pkg_install() {
-    # $HOME/.local/bin
+    # $HOME/.local/xbin
     mkdir -p "$pkg_src_bin"
 
-    # mv ./deno* "$HOME/.local/bin/deno-v1.1.0"
+    # mv ./deno* "$HOME/.local/xbin/deno-v1.1.0"
     mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
 
-    # chmod a+x "$HOME/.local/bin/deno-v1.1.0"
+    # chmod a+x "$HOME/.local/xbin/deno-v1.1.0"
     chmod a+x "$pkg_src_cmd"
 }
 
@@ -37,6 +37,6 @@ pkg_link() {
     # rm -f "$HOME/.local/bin/deno"
     rm -f "$pkg_dst_cmd"
 
-    # ln -s "$HOME/.local/bin/deno-v1.1.0" "$HOME/.local/bin/deno"
+    # ln -s "$HOME/.local/xbin/deno-v1.1.0" "$HOME/.local/bin/deno"
     ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
 }

deno/releases.js

@@ -11,12 +11,7 @@ module.exports = function (request) {
     // remove checksums and .deb
     all.releases = all.releases
       .filter(function (rel) {
-        let isMeta = rel.name.endsWith('.d.ts');
-        if (isMeta) {
-          return false;
-        }
-
-        return true;
+        return !/(\.txt)|(\.deb)$/i.test(rel.name);
       })
       .map(function (rel) {
         var ext;

duckdns.sh/releases.js

@@ -17,7 +17,6 @@ module.exports = function (request) {
   ];
   let oses = ['freebsd', 'linux', 'macos', 'posix'];
   return githubSource(request, owner, repo, oses, arches).then(function (all) {
-    all._names = ['DuckDNS.sh', 'duckdns.sh', 'legacy'];
     return all;
   });
 };

fd/install.ps1

@@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
     Write-Output "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
@@ -29,13 +29,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
 
     # Settle unpacked archive into place
     Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\bin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin"
+    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
     Pop-Location
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\bin\$VERNAME'"
+Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse
+Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

fd/releases.js

@@ -6,17 +6,6 @@ var repo = 'fd';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      if (build.name === 'fd') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

ffmpeg/releases.js

@@ -10,11 +10,6 @@ module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     all.releases = all.releases
       .filter(function (rel) {
-        let isFfmpeg = rel.name.includes('ffmpeg');
-        if (!isFfmpeg) {
-          return;
-        }
-
         // remove README and LICENSE
         return !['.README', '.LICENSE'].includes(path.extname(rel.name));
       })

fish/releases.js

@@ -4,19 +4,10 @@ var github = require('../_common/github.js');
 var owner = 'fish-shell';
 var repo = 'fish-shell';
 
-var ODDITIES = ['bundledpcre'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     all.releases = all.releases
       .map(function (rel) {
-        for (let oddity of ODDITIES) {
-          let isOddity = rel.name.includes(oddity);
-          if (isOddity) {
-            return;
-          }
-        }
-
         // We can extract the macos bins from the .app
         if (/\.app\.zip$/.test(rel.name)) {
           rel.os = 'macos';

flutter/releases.js

@@ -1,98 +1,59 @@
 'use strict';
 
-var FLUTTER_OSES = ['macos', 'linux', 'windows'];
+var map = {};
 
-// stable, beta, dev
-var channelMap = {};
-
-// This can be spot-checked against
-// https://docs.flutter.dev/release/archive?tab=windows
-
-// The release URLs are
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_macos.json
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_windows.json
-// The old release URLs are
-// - https://storage.googleapis.com/flutter_infra/releases/releases_macos.json
-// - https://storage.googleapis.com/flutter_infra/releases/releases_linux.json
-// - https://storage.googleapis.com/flutter_infra/releases/releases_windows.json
-
-// The data looks like
-// {
-//   "base_url": "https://storage.googleapis.com/flutter_infra/releases",
-//   "current_release": {
-//     "beta": "b22742018b3edf16c6cadd7b76d9db5e7f9064b5",
-//     "dev": "fa5883b78e566877613ad1ccb48dd92075cb5c23",
-//     "stable": "02c026b03cd31dd3f867e5faeb7e104cce174c5f"
-//   },
-//   "releases": [
-//     {
-//       "hash": "fa5883b78e566877613ad1ccb48dd92075cb5c23",
-//       "channel": "dev",
-//       "version": "2.3.0-16.0.pre",
-//       "release_date": "2021-05-27T23:58:47.683121Z",
-//       "archive": "dev/macos/flutter_macos_2.3.0-16.0.pre-dev.zip",
-//       "sha256": "f572b42d36714e6c58a3ed170b93bb414e2ced3ca4bde5094fbe18061cbcba6c"
-//     },
-//     {
-//       "hash": "02c026b03cd31dd3f867e5faeb7e104cce174c5f",
-//       "channel": "stable",
-//       "version": "2.2.1",
-//       "release_date": "2021-05-27T23:06:07.243882Z",
-//       "archive": "stable/macos/flutter_macos_2.2.1-stable.zip",
-//       "sha256": "6373d39ec563c337600baf42a42b258420208e4523d85479373e113d61d748df"
-//     },
-//     {
-//       "hash": "b22742018b3edf16c6cadd7b76d9db5e7f9064b5",
-//       "channel": "beta",
-//       "version": "2.2.0",
-//       "release_date": "2021-05-19T21:14:59.281482Z",
-//       "archive": "beta/macos/flutter_macos_2.2.0-beta.zip",
-//       "sha256": "31ab530e708f8d1274712211253a27a4ce7d676f139d30f2ec021df22382f052"
-//     }
-//   ]
-// }
-
-module.exports = async function (request) {
-  let all = {
+module.exports = function (request) {
+  var all = {
     download: '',
     releases: [],
-    channels: [],
   };
-
-  for (let osname of FLUTTER_OSES) {
-    let resp = await request({
-      url: `https://storage.googleapis.com/flutter_infra_release/releases/releases_${osname}.json`,
-      json: true,
-    });
-
-    let body = resp.body;
-    all.download = `${body.base_url}/{{ download }}`;
-
-    for (let asset of body.releases) {
-      if (!channelMap[asset.channel]) {
-        channelMap[asset.channel] = true;
-      }
-
-      all.releases.push({
-        version: asset.version,
-        _version: `${asset.version}-${asset.channel}`,
-        lts: false,
-        channel: asset.channel,
-        date: asset.release_date.replace(/T.*/, ''),
-        //sha256: asset.sha256,
-        download: asset.archive,
+  return Promise.all(
+    ['macos', 'linux', 'windows'].map(function (osname) {
+      return request({
+        url:
+          'https://storage.googleapis.com/flutter_infra/releases/releases_' +
+          osname +
+          '.json',
+        json: true,
+      }).then(function (resp) {
+        var body = resp.body;
+        all.download = body.base_url + '/{{ download }}';
+        body.releases.forEach(function (asset) {
+          if (!map[asset.channel]) {
+            map[asset.channel] = true;
+          }
+          all.releases.push({
+            // nix leading 'v'
+            version: asset.version.replace(/v/, ''),
+            lts: false,
+            channel: asset.channel,
+            date: asset.release_date.replace(/T.*/, ''),
+            os: osname,
+            arch: 'amd64',
+            hash: '-', // not sure about including hash / sha256 yet
+            download: asset.archive,
+          });
+        });
       });
-    }
-  }
-
-  all.channels = Object.keys(channelMap);
-
-  // note: versions have a waterfall relationship with channels:
-  // - a release that is in beta today may become stable tomorrow
-  // - semver prereleases are either beta or dev
-
-  return all;
+    }),
+  ).then(function () {
+    all.releases.sort(function (a, b) {
+      if ('stable' === a.channel && a.channel !== b.channel) {
+        return -1;
+      }
+      if ('stable' === b.channel && a.channel !== b.channel) {
+        return 1;
+      }
+      if ('beta' === a.channel && a.channel !== b.channel) {
+        return -1;
+      }
+      if ('beta' === b.channel && a.channel !== b.channel) {
+        return 1;
+      }
+      return new Date(b.date).valueOf() - new Date(a.date).valueOf();
+    });
+    return all;
+  });
 };
 
 if (module === require.main) {

fzf/install.ps1

@@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
     Write-Output "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
@@ -29,13 +29,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
 
     # Settle unpacked archive into place
     Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\bin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin"
+    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
     Pop-Location
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\bin\$VERNAME'"
+Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse
+Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

git-gpg-init/install.ps1

@@ -2,4 +2,4 @@
 
 Write-Output "'git-gpg-init@$Env:WEBI_TAG' is an alias for 'git-config-gpg@$Env:WEBI_VERSION'"
 IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
-curl.exe -A MS -fsSL "$Env:WEBI_HOST/git-config-gpg@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/git-config-gpg@$Env:WEBI_VERSION" | powershell

git/releases.js

@@ -12,15 +12,12 @@ module.exports = function (request) {
     all.releases = all.releases
       .filter(function (rel) {
         rel.os = 'windows';
-        rel._version = rel.version.replace(/\.windows.1.*/, '');
-        rel._version = rel._version.replace(/\.windows(\.\d)/, '$1');
         return (
           /MinGit/i.test(rel.name || rel.download) &&
           !/busybox/i.test(rel.name || rel.download)
         );
       })
       .slice(0, 20);
-    all._names = ['MinGit', 'git'];
     return all;
   });
 };

gitea/install.ps1

@@ -18,12 +18,6 @@ $pkg_src = "$pkg_src_cmd"
 New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
 $pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 
-Write-Output "Checking for Git..."
-IF (-Not (Get-Command -Name "git" -ErrorAction Silent)) {
-    & "$HOME\.local\bin\webi-pwsh.ps1" git
-    $null = Sync-EnvPath
-}
-
 # Fetch archive
 IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     Write-Output "Downloading gitea from $Env:WEBI_PKG_URL to $pkg_download"

gitea/releases.js

@@ -4,24 +4,12 @@ var github = require('../_common/github.js');
 var owner = 'go-gitea';
 var repo = 'gitea';
 
-var ODDITIES = ['-gogit-', '-docs-'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      for (let oddity of ODDITIES) {
-        let isOddity = rel.name.includes(oddity);
-        if (isOddity) {
-          return false;
-        }
-      }
-
-      return true;
+      return !/(\.txt)|(\.deb)|(\.asc)|(\.sha256)$/i.test(rel.name);
     });
-
-    // "windows-4.0" as a nod to Windows NT  ¯\_(ツ)_/¯
-    all._names = ['gitea', '-4.0-'];
     return all;
   });
 };

go-essentials/install.ps1

@@ -2,7 +2,8 @@
 
 if (!(Get-Command "go.exe" -ErrorAction SilentlyContinue)) {
     & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" go
-    $null = Sync-EnvPath
+    # because we need git.exe to be available to golang immediately
+    $Env:PATH = "$Env:USERPROFILE\go\bin;$Env:USERPROFILE\.local\opt\go\bin;$Env:PATH"
 }
 
 # Special to go: re-run all go tooling builds

go/install.ps1

@@ -12,7 +12,8 @@ $pkg_dst_bin = "$pkg_dst\bin"
 
 if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue)) {
     & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" git
-    $null = Sync-EnvPath
+    # because we need git.exe to be available to golang immediately
+    $Env:PATH = "$Env:USERPROFILE\.local\opt\git\cmd;$Env:PATH"
 }
 
 # Fetch archive

go/releases.js

@@ -7,17 +7,6 @@ var archMap = {
   386: 'x86',
 };
 
-let ODDITIES = ['bootstrap', '-arm6.'];
-
-function isOdd(filename) {
-  for (let oddity of ODDITIES) {
-    let isOddity = filename.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 function getAllReleases(request) {
   /*
   {
@@ -54,21 +43,13 @@ function getAllReleases(request) {
         parts.push('0');
       }
       var version = parts.join('.');
-      // nix 'go' prefix
-      var fileversion = release.version.slice(2);
 
       release.files.forEach((asset) => {
-        let odd = isOdd(asset.filename);
-        if (odd) {
-          return;
-        }
-
         var filename = asset.filename;
         var os = osMap[asset.os] || asset.os || '-';
         var arch = archMap[asset.arch] || asset.arch || '-';
         all.releases.push({
           version: version,
-          _version: fileversion,
           // all go versions >= 1.0.0 are effectively LTS
           lts: (parts[0] > 0 && release.stable) || false,
           channel: (release.stable && 'stable') || 'beta',

golang/install.ps1

@@ -12,7 +12,8 @@ $pkg_dst_bin = "$pkg_dst\bin"
 
 if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue)) {
     & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" git
-    $null = Sync-EnvPath
+    # because we need git.exe to be available to golang immediately
+    $Env:PATH = "$Env:USERPROFILE\.local\opt\git\cmd;$Env:PATH"
 }
 
 # Fetch archive

goreleaser/install.sh

@@ -50,10 +50,11 @@ __init_goreleaser() {
         # This trims it down to just the version number:
         #       1.21.2
         # shellcheck disable=SC2046,SC2005 # unquoted echo trims whitespace
-        goreleaser --version 2> /dev/null |
-            grep 'GitVersion:' |
-            cut -d':' -f2 |
-            tr -d ' '
+        echo $(
+            goreleaser --version 2> /dev/null |
+                grep 'GitVersion:' |
+                cut -d':' -f2
+        )
     }
 
 }

gpg-pubkey/install.ps1

@@ -1,43 +1,37 @@
 #!/usr/bin/env pwsh
 
-$ErrorActionPreference = 'stop'
+#
+# gpg-pubkey-id
+#
+$MY_CMD = "gpg-pubkey"
+$MY_SUBCMD = "gpg-pubkey-id"
 
-function Install-WebiHostedScript () {
-    Param(
-        [string]$Package,
-        [string]$ScriptName
-    )
-    $PwshName = "_${ScriptName}.ps1"
-    $PwshUrl = "${Env:WEBI_HOST}/packages/${Package}/${ScriptName}.ps1"
-    $PwshPath = "$HOME\.local\bin\${PwshName}"
-    $OldPath = "$HOME\.local\bin\${ScriptName}.ps1"
+& curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_HOST/packages/$MY_CMD/$MY_SUBCMD.ps1" -o "$Env:USERPROFILE\.local\bin\$MY_SUBCMD.ps1.part"
+Remove-Item -Path "$Env:USERPROFILE\.local\bin\$MY_SUBCMD.ps1" -Recurse -ErrorAction Ignore
+& Move-Item "$Env:USERPROFILE\.local\bin\$MY_SUBCMD.ps1.part" "$Env:USERPROFILE\.local\bin\$MY_SUBCMD.ps1"
+Set-Content -Path "$Env:USERPROFILE\.local\bin\$MY_SUBCMD.bat" -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\$MY_SUBCMD.ps1 %1`r`npopd"
 
-    $BatPath = "$HOME\.local\bin\${ScriptName}.bat"
-    $PwshExec = "powershell -ExecutionPolicy Bypass"
-    $Bat = "@echo off`r`n$PwshExec %USERPROFILE%\.local\bin\${PwshName} %*"
+#
+# gpg-pubkey
+#
+$MY_CMD = "gpg-pubkey"
 
-    Invoke-DownloadUrl -Force -URL $PwshUrl -Path $PwshPath
-    Set-Content -Path $BatPath -Value $Bat
-    Write-Host "    Created alias ${BatPath}"
-    Write-Host "      to run ${PwshPath}"
-
-    # fix for old installs
-    Remove-Item -Path $OldPath -Force -ErrorAction Ignore
-}
-
-Install-WebiHostedScript -Package "gpg-pubkey" -ScriptName "gpg-pubkey-id"
-Install-WebiHostedScript -Package "gpg-pubkey" -ScriptName "gpg-pubkey"
+& curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_HOST/packages/$MY_CMD/$MY_CMD.ps1" -o "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1.part"
+Remove-Item -Path "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1" -Recurse -ErrorAction Ignore
+& Move-Item "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1.part" "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1"
+Set-Content -Path "$Env:USERPROFILE\.local\bin\$MY_CMD.bat" -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\$MY_CMD.ps1 %1`r`npopd"
 
 #
 # Check the gpg exists
 #
-IF (-Not (Get-Command -Name "gpg" -ErrorAction SilentlyContinue)) {
-    & "${Env:USERPROFILE}\.local\bin\webi-pwsh.ps1" gpg
-    $Env:Path = [Environment]::GetEnvironmentVariable("Path", "User")
 
-    IF (-Not (Get-Command -Name "gpg" -ErrorAction SilentlyContinue)) {
+$gpg_exists = Get-Command gpg 2> $null
+if (!$gpg_exists) {
+    curl.exe "$Env:WEBI_HOST/gpg" | powershell
+    $gpg_exists = Get-Command gpg 2> $null
+    if (!$gpg_exists) {
         Write-Output ""
-        Write-Output "(exited because gpg is not installed)"
+        Write-Output "(exited because gpg is not existalled)"
         Write-Output ""
         Exit 1
     }
@@ -46,4 +40,4 @@ IF (-Not (Get-Command -Name "gpg" -ErrorAction SilentlyContinue)) {
 #
 # run gpg-pubkey
 #
-& "$Env:USERPROFILE\.local\bin\gpg-pubkey.bat"
+& "$Env:USERPROFILE\.local\bin\$MY_CMD.bat"

gpg/releases.js

@@ -41,6 +41,7 @@ function transformReleases(links) {
 
   let releases = links
     .map(function (link) {
+      // strip 'go' prefix, standardize version
       let isLts = ltsRe.test(link);
       let parts = link.match(matcher);
       if (!parts || !parts[2]) {
@@ -51,12 +52,10 @@ function transformReleases(links) {
       if (segs.length > 3) {
         version += '+' + segs.slice(3);
       }
-      let fileversion = segs.join('.');
 
       return {
         name: parts[1],
         version: version,
-        _version: fileversion,
         // all go versions >= 1.0.0 are effectively LTS
         lts: isLts,
         channel: 'stable',
@@ -71,7 +70,6 @@ function transformReleases(links) {
     .filter(Boolean);
 
   return {
-    _names: ['GnuPG', 'gpgosx'],
     releases: releases,
   };
 }

hugo-extended/releases.js

@@ -13,9 +13,12 @@ module.exports = async function (request) {
       return false;
     }
 
-    let isOldAlias = rel.name.includes('Linux-64bit');
-    if (isOldAlias) {
-      return false;
+    // remove checksums and .deb
+    for (let ignorableExt of ['.txt', '.deb']) {
+      let isIgnorable = rel.name.endsWith(ignorableExt);
+      if (isIgnorable) {
+        return false;
+      }
     }
 
     return true;

hugo/releases.js

@@ -13,9 +13,12 @@ module.exports = async function (request) {
       return false;
     }
 
-    let isOldAlias = rel.name.includes('Linux-64bit');
-    if (isOldAlias) {
-      return false;
+    // remove checksums and .deb
+    for (let ignorableExt of ['.txt', '.deb']) {
+      let isIgnorable = rel.name.endsWith(ignorableExt);
+      if (isIgnorable) {
+        return false;
+      }
     }
 
     return true;

iterm2-utils/install.sh

@@ -4,8 +4,6 @@ set -u
 
 __iterm2_utils() {
     curl -fsSL https://iterm2.com/shell_integration/install_shell_integration_and_utilities.sh | bash
-
-    webi_path_add ~/.iterm2/
 }
 
 __iterm2_utils

iterm2/install.sh

@@ -16,26 +16,9 @@ _install_iterm2() {
         exit 1
     fi
 
-    if test -d /Applications/iTerm.app; then
-        my_curver="$(
-            grep -A 2 CFBundleShortVersionString \
-                /Applications/iTerm.app/Contents/Info.plist |
-                tr '<> \t' '\n' |
-                grep -E '\d\.\d\.\d'
-        )"
-        if test "${my_curver}" = "${WEBI_VERSION}"; then
-            echo "    Found /Applications/iTerm.app/ (${my_curver})"
-            return 0
-        fi
-
-        echo "    Replacing /Applications/iTerm.app/ (${my_curver})"
-        mv /Applications/iTerm.app "${WEBI_TMP}/iTerm.app-webi.bak"
-    fi
-
     webi_download \
         "${WEBI_PKG_URL}" \
         "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
-
     webi_extract
 
     if [ ! -d "${WEBI_TMP}/iTerm.app" ]; then
@@ -44,9 +27,11 @@ _install_iterm2() {
         exit 1
     fi
 
+    if [ -d /Applications/iTerm.app ]; then
+        mv /Applications/iTerm.app "${WEBI_TMP}/iTerm.app-webi.bak"
+    fi
     mkdir -p /Applications/
     mv "${WEBI_TMP}/iTerm.app" /Applications/
-    echo "    Installed to /Applications/iTerm.app/"
 }
 
 _install_iterm2

iterm2/releases.js

@@ -24,24 +24,17 @@ function transformReleases(links) {
   //console.log(links.length);
 
   return {
-    _names: ['iTerm2', 'iterm2'],
     releases: links
       .map(function (link) {
+        // strip 'go' prefix, standardize version
         var channel = /\/stable\//.test(link) ? 'stable' : 'beta';
-
         var parts = link
           .replace(/.*\/iTerm2[-_]v?(\d_.*)\.zip/, '$1')
           .split('_');
         var version = parts.join('.').replace(/([_-])?beta/, '-beta');
 
-        // ex: 3.5.0-beta17 => 3_5_0beta17
-        // ex: 3.0.2-preview => 3_0_2-preview
-        let fileversion = version.replace(/\./g, '_');
-        fileversion = fileversion.replace(/-beta/g, 'beta');
-
         return {
           version: version,
-          _version: fileversion,
           // all go versions >= 1.0.0 are effectively LTS
           lts: 'stable' === channel,
           channel: channel,

jq/install.ps1

@@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
     Write-Output "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
@@ -26,13 +26,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) {
     # Settle unpacked archive into place
     Write-Output "New Name: $VERNAME"
     Get-ChildItem "$Env:PKG_NAME-v*" | Select-Object -f 1 | Rename-Item -NewName "$VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\bin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin"
+    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
     Pop-Location
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\bin\$VERNAME'"
+Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse
+Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

jq/releases.js

@@ -4,32 +4,11 @@ var github = require('../_common/github.js');
 var owner = 'stedolan';
 var repo = 'jq';
 
-let ODDITIES = ['-no-oniguruma'];
-
-function isOdd(build) {
-  for (let oddity of ODDITIES) {
-    let isOddity = build.name.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      let odd = isOdd(build);
-      if (odd) {
-        continue;
-      }
-
-      build.version = build.version.replace(/^jq\-/, '');
-      builds.push(build);
-    }
-
-    all.releases = builds;
+    all.releases.forEach(function (rel) {
+      rel.version = String(rel.version).replace(/^jq\-/, '');
+    });
     return all;
   });
 };

kubectx/releases.js

@@ -4,25 +4,16 @@ var github = require('../_common/github.js');
 var owner = 'ahmetb';
 var repo = 'kubectx';
 
+/******************************************************************************/
+/** Note: Delete this Comment!                                               **/
+/**                                                                          **/
+/** Need a an example that filters out miscellaneous release files?          **/
+/**   See `deno`, `gitea`, or `caddy`                                        **/
+/**                                                                          **/
+/******************************************************************************/
+
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      // this installs separately
-      if (build.name.includes('kubens')) {
-        continue;
-      }
-
-      // this is the legacy bash script
-      if (build.name === 'kubectx') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

kubens/releases.js

@@ -6,23 +6,10 @@ var repo = 'kubectx';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      // this installs separately
-      if (build.name.includes('kubectx')) {
-        continue;
-      }
-
-      // this is the legacy bash script
-      if (build.name === 'kubens') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
+    // remove kubectx, etc. from kubens list
+    all.releases = all.releases.filter(function (rel) {
+      return !/(\.txt)|(kubectx)|(kubectx_)$/i.test(rel.name);
+    });
     return all;
   });
 };

macos/releases.js

@@ -41,11 +41,7 @@ var headers = {
 };
 
 module.exports = function (request) {
-  var all = {
-    _names: ['InstallOS'],
-    download: '',
-    releases: [],
-  };
+  var all = { download: '', releases: [] };
 
   return Promise.all(
     oses.map(function (os) {

myip/install.ps1

@@ -1,28 +1,7 @@
 #!/usr/bin/env pwsh
 
-$ErrorActionPreference = 'stop'
-
-function Install-WebiHostedScript () {
-    Param(
-        [string]$Package,
-        [string]$ScriptName
-    )
-    $PwshName = "_${ScriptName}.ps1"
-    $PwshUrl = "${Env:WEBI_HOST}/packages/${Package}/${ScriptName}.ps1"
-    $PwshPath = "$HOME\.local\bin\${PwshName}"
-    $OldPath = "$HOME\.local\bin\${ScriptName}.ps1"
-
-    $BatPath = "$HOME\.local\bin\${ScriptName}.bat"
-    $PwshExec = "powershell -ExecutionPolicy Bypass"
-    $Bat = "@echo off`r`n$PwshExec %USERPROFILE%\.local\bin\${PwshName} %*"
-
-    Invoke-DownloadUrl -Force -URL $PwshUrl -Path $PwshPath
-    Set-Content -Path $BatPath -Value $Bat
-    Write-Host "    Created alias ${BatPath}"
-    Write-Host "      to run ${PwshPath}"
-
-    # fix for old installs
-    Remove-Item -Path $OldPath -Force -ErrorAction Ignore
-}
-
-Install-WebiHostedScript -Package "myip" -ScriptName "myip"
+& curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_HOST/packages/myip/myip.ps1" -o "$Env:USERPROFILE\.local\bin\myip.ps1.part"
+Remove-Item -Path "$Env:USERPROFILE\.local\bin\myip.ps1" -Recurse -ErrorAction Ignore
+& Move-Item "$Env:USERPROFILE\.local\bin\myip.ps1.part" "$Env:USERPROFILE\.local\bin\myip.ps1"
+Set-Content -Path "$Env:USERPROFILE\.local\bin\myip.bat" -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\myip.ps1 %1`r`npopd"
+& "$Env:USERPROFILE\.local\bin\myip.bat"

node/install.sh

@@ -40,7 +40,5 @@ pkg_link() {
 }
 
 pkg_done_message() {
-    b_dst="$(fn_sub_home "${pkg_dst}")"
-    echo ""
-    echo "    Installed $(t_pkg 'node') and $(t_pkg 'npm') at $(t_path "${b_dst}/")"
+    echo "Installed 'node' and 'npm' at $pkg_dst"
 }

node/releases.js

@@ -119,7 +119,6 @@ async function getAllReleases(request) {
         let os = osMap[osPart];
         let archPart = fileParts[1];
         let arch = archMap[archPart];
-        let libc = '';
         let pkgPart = fileParts[2];
         let pkgs = pkgMap[pkgPart];
         if (!pkgPart) {
@@ -134,16 +133,13 @@ async function getAllReleases(request) {
         if (fileParts[2] === 'musl') {
           extra = '-musl';
           muslNative = true;
-          libc = 'musl';
-        } else if (os === 'linux') {
-          libc = 'gnu';
-        }
-
-        if (osPart === 'osx') {
-          osPart = 'darwin';
         }
 
         pkgs.forEach(function (pkg) {
+          if (osPart === 'osx') {
+            osPart = 'darwin';
+          }
+
           let filename = `node-${build.version}-${osPart}-${archPart}${extra}.${pkg}`;
           if ('msi' === pkg) {
             filename = `node-${build.version}-${archPart}${extra}.${pkg}`;
@@ -160,7 +156,7 @@ async function getAllReleases(request) {
             arch: arch,
             ext: pkg,
             download: downloadUrl,
-            libc: libc,
+            _musl_native: muslNative,
           };
 
           all.releases.push(release);

nvim/README.md

@@ -0,0 +1,21 @@
+---
+title: nvim
+homepage: https://neovim.io/
+tagline: |
+  neovim: hyperextensible Vim-based text editor
+---
+
+To update or switch versions, run `webi nvim@stable` (or `@v0.7`, `@beta`, etc).
+
+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```text
+~/.config/envman/PATH.env
+~/.config/nvim/init.vim
+~/.local/opt/neovim/
+```
+
+## Cheat Sheet

nvim/install.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# shellcheck disable=SC2034
+# "'pkg_cmd_name' appears unused. Verify it or export it."
+
+__init_neovim() {
+    set -e
+    set -u
+
+    ##################
+    # Install neovim #
+    ##################
+
+    # Every package should define these 6 variables
+    pkg_cmd_name="nvim"
+
+    pkg_dst_cmd="$HOME/.local/opt/neovim/bin/nvim"
+    pkg_dst_dir="$HOME/.local/opt/neovim"
+    pkg_dst="$pkg_dst_dir"
+
+    pkg_src_cmd="$HOME/.local/opt/neovim-v$WEBI_VERSION/bin/nvim"
+    pkg_src_dir="$HOME/.local/opt/neovim-v$WEBI_VERSION"
+    pkg_src="$pkg_src_dir"
+
+    # pkg_install must be defined by every package
+    pkg_install() {
+        # mv ./nvim-* ~/.local/opt/neovim-macos
+        mv ./nvim-* "${pkg_src}"
+    }
+
+    # pkg_get_current_version is recommended, but not required
+    pkg_get_current_version() {
+        # 'nvim --version' has output in this format:
+        # NVIM v0.7.2
+        # Build type: Release
+        # LuaJIT 2.1.0-beta3
+        # Compiled by runner@Mac-1656256708179.local
+        #
+        # Features: +acl +iconv +tui
+        # See ":help feature-compile"
+        #
+        #    system vimrc file: "$VIM/sysinit.vim"
+        #   fall-back for $VIM: "/share/nvim"
+        #
+        # Run :checkhealth for more info
+
+        # This trims it down to just the version number:
+        #       0.7.2
+        nvim --version 2> /dev/null |
+            head -n 1 |
+            cut -d ' ' -f 2 |
+            sed 's/v//'
+    }
+
+}
+
+__init_neovim

nvim/releases.js

@@ -1,14 +1,11 @@
 'use strict';
 
 var github = require('../_common/github.js');
-var owner = 'tinygo-org';
-var repo = 'tinygo';
+var owner = 'neovim';
+var repo = 'neovim';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    // all.releases = all.releases.filter(function (rel) {
-    //   return !rel.name.endsWith('.deb');
-    // });
     return all;
   });
 };
@@ -16,8 +13,8 @@ module.exports = function (request) {
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
     all = require('../_webi/normalize.js')(all);
-    // just select the first 5 for demonstration
-    all.releases = all.releases.slice(0, 5);
+    all.releases = all.releases.slice(0, 10);
+    //console.info(JSON.stringify(all));
     console.info(JSON.stringify(all, null, 2));
   });
 }

ollama/releases.js

@@ -19,7 +19,6 @@ module.exports = async function (request) {
   }
   all.releases = releases;
 
-  all._names = ['Ollama', 'ollama'];
   return all;
 };
 

pathman/releases.js

@@ -8,14 +8,7 @@ var baseurl = 'https://git.rootprojects.org';
 module.exports = function (request) {
   return github(request, owner, repo, baseurl).then(function (all) {
     all.releases = all.releases.filter(function (release) {
-      release._filename = release.name;
-
-      let isOldAlias = release.name.includes('armv8');
-      if (isOldAlias) {
-        return false;
-      }
-
-      return true;
+      return !/debug/.test(release.name);
     });
     return all;
   });

postgres/releases.js

@@ -75,7 +75,6 @@ module.exports = async function () {
         download: '',
       },
     ].map(function (rel) {
-      rel._version = `${rel.version}-1`;
       rel.download =
         'https://get.enterprisedb.com/postgresql/' +
         rel.name +
@@ -83,7 +82,6 @@ module.exports = async function () {
       return rel;
     }),
     download: '',
-    _names: ['PostgreSQL', 'postgresql', 'Postgres', 'postgres', 'binaries'],
   };
 };
 

powershell/README.md

@@ -1,11 +1,65 @@
 ---
-title: PowerShell (pwsh alias)
-homepage: https://webinstall.dev/pwsh
+title: Microsoft PowerShell
+homepage: https://docs.microsoft.com/en-us/powershell/
 tagline: |
-  Alias for https://webinstall.dev/pwsh
-alias: pwsh
-description: |
-  See https://webinstall.dev/pwsh
+  PowerShell Core is a cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework.
 ---
 
-Alias for https://webinstall.dev/pwsh
+To update or switch versions, run `webi pwsh@stable` (or `@v7.4`, `@beta`, etc).
+
+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```text
+~/.config/envman/PATH.env
+~/.local/opt/pwsh/
+~/.local/share/powershell/Modules
+```
+
+## Cheat Sheet
+
+> The core benefit of running `pwsh` on Mac or Linux is that you get a way to
+> debug Windows scripts without having to boot up Windows.
+
+For example, if you want to create a `curl.exe -A "windows" | powershell` script
+for Windows (as we do), it's helpful to be able to do some level of debugging on
+other platforms.
+
+### How to Use PowerShell with Vim
+
+Assuming you have [vim-ale](../vim-ale/) installed - which is included with
+[vim-essentials](../vim-essentials/) - all you need to do is install the
+`PSScriptAnalyzer` module.
+
+See the "Lint & Fmt" section below.
+
+### How to Lint & Fmt ps1 Files
+
+You must install `PSScriptAnalyzer`. Then you can use `Invoke-ScriptAnalyzer`
+and `Invoke-Formatter`
+
+```sh
+pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
+```
+
+To lint:
+
+```sh
+my_ps1='./my-file.ps1'
+pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost, PSUseDeclaredVarsMoreThanAssignment -Path \"$my_ps1\""
+```
+
+To fmt:
+
+```sh
+my_ps1='./my-file.ps1'
+my_text="$(
+    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path \"$my_ps1\" -Raw)"
+)"
+printf '%s\n' "${my_text}" > "${my_ps1}"
+```
+
+Note: it is _several hundred times faster_ to lint and fmt from a native
+PowerShell script than from invoking `pwsh -Command` each time.

powershell/install.ps1

@@ -1,8 +0,0 @@
-#!/bin/pwsh
-
-Write-Output "'powershell@$Env:WEBI_TAG' is an alias for 'pwsh@$Env:WEBI_VERSION'"
-
-$PwshBootUrl = "$Env:WEBI_HOST/pwsh@$Env:WEBI_VERSION"
-$PwshBootScript = "$HOME\.local\tmp\install-pwsh-boot.ps1"
-Invoke-DownloadUrl -Force -URL $PwshBootUrl -Path $PwshBootScript
-pwsh -ExecutionPolicy Bypass $PwshBootScript

powershell/install.sh

@@ -2,10 +2,44 @@
 set -e
 set -u
 
-__redirect_alias_pwsh() {
-    echo "'powershell@${WEBI_TAG:-stable}' is an alias for 'pwsh@${WEBI_VERSION-}'"
-    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
-    curl -fsSL "$WEBI_HOST/pwsh@${WEBI_VERSION-}" | sh
+__init_powershell() {
+
+    pkg_cmd_name="pwsh"
+    # no ./bin prefix
+    pkg_src_cmd="$HOME/.local/opt/pwsh-v$WEBI_VERSION/pwsh"
+    pkg_dst_cmd="$HOME/.local/opt/pwsh/pwsh"
+
+    pkg_get_current_version() {
+        # 'pwsh --version' has output in this format:
+        #       PowerShell 7.0.2
+        # This trims it down to just the version number:
+        #       7.0.2
+        pwsh --version 2> /dev/null | head -n 1 | cut -d' ' -f2
+    }
+
+    pkg_install() {
+        # mv ./* "$HOME/.local/opt/pwsh-v7.0.2"
+        mkdir -p "$pkg_src"
+        mv ./* "$pkg_src"
+
+        # symlink powershell to pwsh
+        (
+            cd "$pkg_src" > /dev/null
+            ln -s pwsh powershell
+        )
+    }
+
+    pkg_link() {
+        # rm -f "$HOME/.local/opt/pwsh"
+        rm -f "$pkg_dst"
+
+        # ln -s "$HOME/.local/opt/pwsh-v7.0.2" "$HOME/.local/opt/pwsh"
+        ln -s "$pkg_src" "$pkg_dst"
+    }
+
+    pkg_done_message() {
+        echo "Installed 'pwsh' at $pkg_dst"
+    }
 }
 
-__redirect_alias_pwsh
+__init_powershell

powershell/releases.js

@@ -4,41 +4,17 @@ var github = require('../_common/github.js');
 var owner = 'powershell';
 var repo = 'powershell';
 
-let ODDITIES = ['-fxdependent'];
-
-function isOdd(build) {
-  for (let oddity of ODDITIES) {
-    let isOddity = build.name.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      let odd = isOdd(rel);
-      if (odd) {
-        return false;
-      }
-
       let isPreview = rel.name.includes('-preview.');
       if (isPreview) {
         rel.channel = 'beta';
       }
 
-      let isMusl = rel.download.match(/(\b|_)(musl|alpine)(\b|_)/i);
-      if (isMusl) {
-        // not a fully static build, not gnu-compatible
-        rel.arch = 'musl';
-      }
-
-      return true;
+      return !/(alpine)|(fxdependent)|(\.deb)|(\.pkg)|(\.rpm)$/i.test(rel.name);
     });
-
-    all._names = ['PowerShell', 'powershell'];
     return all;
   });
 };

psscriptanalyzer/README.md

@@ -1,210 +0,0 @@
----
-title: PSScriptAnalyzer
-homepage: https://github.com/PowerShell/PSScriptAnalyzer
-tagline: |
-  PSScriptAnalyzer is Formatter & Linter for PowerShell.
----
-
-To update or switch versions, run `webi psscriptanalyzer`.
-
-## Cheat Sheet
-
-> It's dangerous to go alone! Take _PSScriptAnalyzer_! \
-> (nothing crazy, just the standard fmt & lint tool you'd expect)
-
-You'll probably want [pwsh-essentials](../pwsh-essentials) as well.
-
-### Table of Contents
-
-- Files
-- Manual Install
-- Format
-- Lint
-- Vim Config
-- Beware the BOM!
-- Check Version
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.local/share/powershell/Modules/PSScriptAnalyzer/
-```
-
-### How to Install PSScriptAnalyzer Manually
-
-It's just a one liner, but... a little harder to remember than the webi version:
-
-```sh
-pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
-```
-
-### How to Run the PowerShell Formatter
-
-**`pwsh-fmt`** from ([pwsh-essentials](../pwsh-essentials/)) is the **easiest
-way** to run the formatter on a file or directory.
-
-```sh
-pwsh-fmt ./script.ps1
-```
-
-There is **no built-in one-liner** to do so. You have to do **something like
-this instead**:
-
-```pwsh
-function Format-File($Path) {
-    $WasDirty = $false
-
-    $Original = Get-Content -Path $Path -Raw
-    $Formatted = Invoke-Formatter -ScriptDefinition $Original
-
-    IF ($Original -eq $Formatted) {
-        return $WasDirty
-    }
-    $WasDirty = $true
-
-    # By default Set-Content unconditionally adds an *extra* newline every time
-    # See <https://stackoverflow.com/a/45266681/151312>
-    Set-Content -Path $Path $Formatted -Encoding utf8NoBom -NoNewline
-
-    return $WasDirty
-}
-```
-
-```pwsh
-$WasDirty = Format-File -Path "./script.ps1"
-```
-
-### How to Run the PowerShell Linter
-
-**`pwsh-lint`** from ([pwsh-essentials](../pwsh-essentials/)) is the **easiest
-way** to run the linter on a file or directory.
-
-```sh
-pwsh-lint ./script.ps1
-```
-
-However, this one does have a nice onesliner:
-
-```pwsh
-Invoke-ScriptAnalyzer -Path "./script.ps1" -ExcludeRule PSAvoidUsingWriteHost
-```
-
-You can also make the output much more readable by using `Format-List`:
-
-```pwsh
-$Diags = Invoke-ScriptAnalyzer -Path "./script.ps1" -ExcludeRule PSAvoidUsingWriteHost
-Write-Host ($Diags | Format-List | Out-String)
-```
-
-### How to Run the PowerShell Fixer
-
-**`pwsh-fix`** from ([pwsh-essentials](../pwsh-essentials/)) is the **easiest
-way** to run the fixer on a file or directory.
-
-At first blush the _Fixer_ seems simple - just at `-Fix` to the _Linter_.
-
-However, it's tricky because it will output a Byte-Order-Marker, which
-**requires running the _Formatter_** to remove.
-
-That would look something like this:
-
-```pwsh
-function Repair-File($Path) {
-    $WasDirty = $false
-
-    $Original = Get-Content -Path $Path -Raw
-    $Formatted = Invoke-Formatter -ScriptDefinition $Original
-
-    IF ($Original -eq $Formatted) {
-        return $WasDirty
-    }
-    $WasDirty = $true
-
-    # By default Set-Content unconditionally adds an *extra* newline every time
-    # See <https://stackoverflow.com/a/45266681/151312>
-    Set-Content -Path $Path $Formatted -Encoding utf8NoBom -NoNewline
-
-    return $WasDirty
-}
-```
-
-You'll notice this is very similar to the Formatter solution above, with just
-these changes:
-
-```diff
--     $Formatted = Invoke-Formatter -ScriptDefinition $Original
-+
-+     Invoke-ScriptAnalyzer -Fix -Path $Path -ExcludeRule PSAvoidUsingWriteHost
-+     $Fixed = Get-Content -Path $Path -Raw
-+     $Formatted = Invoke-Formatter -ScriptDefinition $Fixed
-```
-
-### How to Configure PSScriptAnalyzer
-
-There is no standard config location for projects or globally. \
-(not at the time of this writing at least)
-
-Instead you'll need to change the config in your editor.
-
-### How to Configure PSScriptAnalyzer for Vim
-
-1. You'll need to install [vim-ale](../vim-ale/)
-   ```sh
-   webi vim-ale
-   ```
-2. For **Per-User** config, edit `~/.vimrc` and flavor to taste: `~/.vimrc:`
-   ```vim
-    " PowerShell settings
-    let g:ale_powershell_psscriptanalyzer_exclusions = "PSAvoidUsingWriteHost"
-   ```
-3. For **Per-Project** config you'll need to edit `~/.vimrc` _AND_
-   `<PROJECT-DIR>/.vimrc`: `~/.vimrc`:
-   ```vim
-   " Place these 2 lines at the very END of ~/.vimrc
-   " (this will enable per-directory .vimrc loading)
-   set secure
-   set exrc
-   ```
-   `~/PROJECT-NAME/.vimrc`:
-   ```sh
-   " PowerShell settings
-   let g:ale_powershell_psscriptanalyzer_exclusions = "PSAvoidUsingWriteHost"
-   ```
-
-### How to Fix Byte-Order-Marker (BOM)
-
-When you run the _Linter_ with `-Fix` it will sometimes output a UTF
-Byte-Order-Marker to the file.
-
-The good news is that the _Formatter_ will remove this.
-
-So always run the formatter after the linter. 🤷‍♂️
-
-```pwsh
-    $Fixed = Get-Content -Path $Path -Raw
-    $Formatted = Invoke-Formatter -ScriptDefinition $Fixed
-
-    # By default Set-Content unconditionally adds an *extra* newline every time
-    # See <https://stackoverflow.com/a/45266681/151312>
-    Set-Content -Path $Path $Formatted -Encoding utf8NoBom -NoNewline
-```
-
-## Check the Installed Version
-
-This will output the module and version, or `$null`.
-
-```pwsh
-Get-InstalledModule PSScriptAnalyzer `
-    | Select-Object -Property Name, Version `
-    | Format-List
-```
-
-```text
-
-Name    : PSScriptAnalyzer
-Version : 1.21.0
-
-```

psscriptanalyzer/install.ps1

@@ -1,41 +0,0 @@
-#!/usr/bin/env pwsh
-
-function Repair-MissingCommand {
-    Param(
-        [string]$Name,
-        [string]$Package,
-        [string]$Command
-    )
-
-    Write-Host "    Checking for $Name ..."
-    $HasCommand = Get-Command -Name $Command -ErrorAction Silent
-    IF ($HasCommand) {
-        Return
-    }
-
-    & $HOME\.local\bin\webi-pwsh.ps1 $Package
-    $null = Sync-EnvPath
-}
-
-IF ($null -eq $Env:WEBI_HOST -or "" -eq $Env:WEBI_HOST) {
-    $Env:WEBI_HOST = "https://webinstall.dev"
-}
-
-function Install-PSScriptAnalyzer {
-    # Fetch PowerShell Core
-    Repair-MissingCommand -Name "PowerShell Core" -Package "pwsh" -Command "pwsh"
-
-    $NeedsTrust = pwsh -Command "Get-PSRepository -Name 'PSGallery' | Where-Object -Property InstallationPolicy -eq 'Untrusted'"
-    IF ($NeedsTrust) {
-        Write-Host "    Trusting PSRepository 'PSGallery' ..."
-        pwsh -Command "Set-PSRepository -Name 'PSGallery' -InstallationPolicy Trusted"
-    }
-
-    # TODO use arguments array instead
-    Write-Host "    Running 'Install-Module -Name PSScriptAnalyzer' ..."
-    pwsh -Command "Install-Module -Name PSScriptAnalyzer -Repository PSGallery -Scope CurrentUser -AllowClobber"
-
-    pwsh -Command "Get-InstalledModule PSScriptAnalyzer | Select-Object -Property Name, Version"
-}
-
-Install-PSScriptAnalyzer

psscriptanalyzer/install.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-__install_psscriptanalyzer() {
-    echo "Checking for pwsh (PowerShell Core)..."
-    if ! command -v pwsh > /dev/null; then
-        "$HOME/.local/bin/webi" pwsh
-        export PATH="$HOME/.local/opt/pwsh:$PATH"
-        pwsh -V
-    fi
-
-    pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
-    pwsh -Command 'Get-InstalledModule -Name PSScriptAnalyzer | Select-Object -Property "Name", "Version" | Format-List'
-}
-
-__install_psscriptanalyzer

pwsh-essentials/README.md

@@ -1,221 +0,0 @@
----
-title: pwsh-essentials
-homepage: https://webinstall.dev/pwsh-essentials
-tagline: |
-  meta package for our recommended PowerShell plugins and settings
----
-
-To update (replacing the current version) run `webi pwsh-essentials`.
-
-## Cheat Sheet
-
-> The tools you need to write PowerShell effectively.
-
-This meta package will install the full set of plugins and settings we
-recommended.
-
-## Table of Contents
-
-- Files
-- Mostly Case-Insensitive
-- Returns vs Pipeline Streams
-- Strict, Trace, & Verbose Modes
-- The Call Operator "&"
-- curl vs curl.exe
-- Script Policies & Preferences
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/pwsh-fix.ps1
-~/.local/bin/pwsh-fmt.ps1
-~/.local/bin/pwsh-lint.ps1
-~/.local/opt/pwsh/
-~/.local/share/powershell/Modules/PSScriptAnalyzer/
-```
-
-### Things You MUST Know
-
-There are a few key differences to PowerShell from other scripting and
-programming languages you may have used in the past.
-
-Knowing these from the start can save you a _tonne_ of headache.
-
-### 0. PowerShell is Case-Insenstive, Usually
-
-Function and Commandlet names, file paths, and boolean operators are all
-case-insensitive:
-
-```pwsh
-write-host "Hello, World!"
-WRITE-HOST "Hello, World!"
-
-Write-Host "HELLO, WORLD!" -eq "hello, world!"
-# True
-```
-
-However, raw string and byte functions are case sensitive unless
-'CurrentCultureIgnoreCase' is used:
-
-```pwsh
-"https://webi.sh".StartsWith("HTTPS://")
-# False
-
-"https://webi.sh".StartsWith("HTTPS://", 'CurrentCultureIgnoreCase')
-# True
-```
-
-### 1. PowerShell Doesn't Have Return Values
-
-There's not so much concept of a "return" as a "pipeline stream".
-
-All values which are not assigned to a variable, such as `$Foobar` - or
-`$null` - are pipelined.
-
-- There are no _Return Values_
-- The `Return` keyword only serves to exit early.
-- The result of EVERY command is put into a _Pipeline_
-- You can pick which _Pipeline_ a result is written to:
-  - `... | Write-Output` (the default)
-  - `... | Write-Debug`
-  - `... | Write-Verbose`
-  - `... | Write-Information`
-  - `... | Write-Warning`
-  - `... | Write-Error`
-  - `... | Write-Host` (forced console output, no Pipeline) \
-    (also, [considered "evil"](https://stackoverflow.com/a/38527767/151312))
-- Results captured with a variable DO NOT enter a pipeline
-  - `$Foobar = ...` (captured to variable, no Pipeline)
-  - `$null = ...` (no Pipleline) \
-    (the same as `... | Out-Null`, but easier to read and _much_ faster)
-
-#### Example
-
-```pwsh
-function Get-LotsInThePipeline ($Thing1, $Thing2) {
-    Write-Output "a"
-    1
-
-    IF ($Thing) {
-        $null = Write-Output "b"
-        $null = 2
-        $Thing2
-        Return
-    }
-
-    Write-Output "c"
-    3
-}
-
-Get-LotsInThePipeline $true 'red'
-Get-LotsInThePipeline $false 'blue'
-```
-
-There are two possible outputs for this program:
-
-```text
-a, 1, "red"
-a, 1, c, 3
-```
-
-When you need a limited set of pipeline values, you'll need to `$null = xxxx`...
-a lot.
-
-See <https://stackoverflow.com/q/29556437/151312>
-
-### 2. Strict, Trace, & Verbose Modes
-
-```pwsh
-# set -e
-$ErrorActionPreference = "Stop"
-
-# set -x
-Set-PSDebug -Trace 2
-
-# DEBUG='true'
-$VerbosePreference="Continue"
-# if test -n "$DEBUG"; then echo "Debug 123"; fi
-Write-Verbose "Debug: 123"
-```
-
-### 3. The Call Operator (`&`)
-
-Normally you can run a command the same as a commandlet:
-
-```pwsh
-# Built-in Commandlet
-Write-Host "Unpacking the tarball..."
-
-# External Command
-tar xvf foobar.tar.gz
-```
-
-However, if the command is any of:
-
-- a script (particular that will **change its parent's variables**)
-- accessed directly by it's path (i.e. it's not in `$Env:Path`)
-- in a path with a space
-
-you must use the call operator:
-
-```pwsh
-# can't write parent's variables
-pwsh -ExecutionPolicy Bypass $HOME\.local\bin\_webi.ps1 xz
-
-# can write parent's variables (same process)
-& $HOME\.local\bin\_webi.ps1 xz
-
-# not in PATH, and has space in its path
-& ".\Foo Bar\foobar.exe" -baz
-```
-
-To use it with multiple arguments:
-
-```pwsh
-# this can be just the name, or the full path
-$Cmd = 'curl.exe'
-
-# mind the leading ,
-$CmdArguments = , '--fail-with-body', '-sS'
-
-& $Cmd $CmdArguments -o example.html 'https://example.com'
-```
-
-As you can see, the array of options and arguments is flattened, which makes
-constructing commands with complex arrangements much easier than...
-<small>posix</small> (but don't tell my friends I said that).
-
-### 4. PowerShell's curl vs Windows' curl.exe
-
-PowerShell has a built-in `curl` which is an alias for the `Invoke-WebRequest`
-commandlet.
-
-Never use `curl`. Always use `curl.exe`.
-
-### 5. PowerShell Preferences and Policies
-
-- _Execution Policy_ must be set to allow PowerShell to run scripts:
-  ```pwsh
-  # from a shell
-  powershell -ExecutionPolicy Bypass .\foobar.ps1
-  ```
-  ```pwsh
-  # for a script, itself
-  Set-ExecutionPolicy Bypass -Scope Process
-  & .\foobar.ps1
-  ```
-- Set _Strict Mode_ (like `set -e` in Bash, etc)
-  ```sh
-  $ErrorActionPreference = 'Stop'
-  ```
-- Eliminate _Progress Bars_ (they _really_ slow Windows down) \
-  ```sh
-  $ProgressPreference = 'SilentlyContinue'
-  ```
-  The number of progress created by `Invoke-WebRequest` during a download is so
-  many that it literally can't download files over a few kilobytes in a
-  reasonable amount of time unless this is turned off.

pwsh-essentials/install.ps1

@@ -1,65 +0,0 @@
-#!/usr/bin/env pwsh
-
-$PkgName = "pwsh-essentials"
-
-function Repair-MissingCommand {
-    Param(
-        [string]$Name,
-        [string]$Package,
-        [string]$Command
-    )
-
-    Write-Host "    Checking for $Name ..."
-    $HasCommand = Get-Command -Name $Command -ErrorAction Silent
-    IF ($HasCommand) {
-        Return
-    }
-
-    & $HOME\.local\bin\webi-pwsh.ps1 $Package
-    $null = Sync-EnvPath
-}
-
-function Install-WebiHostedPSCoreScript () {
-    Param(
-        [string]$Package,
-        [string]$ScriptName
-    )
-    $PwshName = "_${ScriptName}.ps1"
-    $PwshUrl = "${Env:WEBI_HOST}/packages/${Package}/${ScriptName}.ps1"
-    $PwshPath = "$HOME\.local\bin\${PwshName}"
-    $OldPath = "$HOME\.local\bin\${ScriptName}.ps1"
-
-    $BatPath = "$HOME\.local\bin\${ScriptName}.bat"
-    $PwshExec = "pwsh -ExecutionPolicy Bypass"
-    $Bat = "@echo off`r`n$PwshExec %USERPROFILE%\.local\bin\${PwshName} %*"
-
-    Invoke-DownloadUrl -Force -URL $PwshUrl -Path $PwshPath
-    Set-Content -Path $BatPath -Value $Bat
-    Write-Host "    Created alias ${BatPath}"
-    Write-Host "      to run ${PwshPath}"
-
-    # fix for old installs
-    Remove-Item -Path $OldPath -Force -ErrorAction Ignore
-}
-
-function Install-PwshEssential {
-    # Fetch PowerShell Core
-    Repair-MissingCommand -Name "PowerShell Core" -Package "pwsh" -Command "pwsh"
-
-    # Fetch PSScriptAnalyzer (fmt, lint, fix)
-    & $HOME\.local\bin\webi-pwsh.ps1 psscriptanalyzer
-
-    # Fetch shorthand commands to fmt, lint, & fix
-    $ScriptNames = , "pwsh-fmt", "pwsh-fix", "pwsh-lint"
-    foreach ($ScriptName in $ScriptNames) {
-        Write-Host ""
-        Write-Host "${TTask}Installing${TReset} ${TName}$ScriptName${TReset}"
-        Install-WebiHostedPSCoreScript -Package $PkgName -ScriptName $ScriptName
-    }
-
-    $PwshRunUrl = "${Env:WEBI_HOST}/packages/${PkgName}/pwsh-run.bat"
-    $PwshRunPath = "$HOME\.local\bin\pwsh-run.bat"
-    Invoke-DownloadUrl -Force -URL $PwshRunUrl -Path $PwshRunPath
-}
-
-Install-PwshEssential

pwsh-essentials/install.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-__run_pwsh_essentials() {
-    # PowerShell Core
-    if ! command -v pwsh > /dev/null; then
-        "$HOME/.local/bin/webi" "pwsh@${WEBI_TAG}"
-    fi
-    export PATH="$HOME/.local/opt/pwsh:$PATH"
-
-    # PSScriptAnalyzer (Linter, Fixer, & Formatter)
-    "$HOME/.local/bin/webi" "psscriptanalyzer"
-
-    # pwsh-fmt, pwsh-fix, pwsh-lint
-    for b_file in pwsh-fmt.ps1 pwsh-fix.ps1 pwsh-lint.ps1; do
-        rm -f ~/.local/bin/"${b_file}"
-        webi_download \
-            "${WEBI_HOST}/packages/${PKG_NAME}/${b_file}" \
-            ~/.local/bin/"${b_file}" \
-            "${b_file}"
-        chmod a+x ~/.local/bin/"${b_file}"
-        ~/.local/bin/"${b_file}" ~/.local/bin/"${b_file}"
-    done
-    echo ""
-}
-
-__run_pwsh_essentials

pwsh-essentials/pwsh-fix.ps1

@@ -1,93 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = "Stop"
-
-# See
-#   - <https://superuser.com/q/1264444>
-#   - <https://stackoverflow.com/a/60572643/151312>
-$Esc = [char]27
-$Warn = "${Esc}[33m"
-$Bold = "${Esc}[1m"
-$Dim = "${Esc}[2m"
-$ResetWeight = "${Esc}[22m"
-$ResetColor = "${Esc}[39m"
-
-$PwshExts = "*.ps1", "*.psm1"
-
-function Repair-All($Root) {
-    $WereDirty = $false
-
-    $Children = Get-ChildItem -Path $Root -File -Recurse -Include $PwshExts
-    foreach ($Child in $Children) {
-        $Style = $Dim
-
-        $WasDirty = Repair-File -Filepath $Child
-        IF ($WasDirty) {
-            $WereDirty = $true
-            $Style = $Bold
-        }
-        $RelPath = [System.IO.Path]::GetRelativePath($Root, $Child)
-        IF (Test-Path -PathType Leaf -Path $Root) {
-            $RelPath = $Root
-        }
-        Write-Host "    ${Style}${RelPath}${ResetWeight}"
-    }
-
-    return $WereDirty
-}
-
-function Repair-File {
-    Param (
-        [string]$Filepath
-    )
-    $WasDirty = $false
-
-    $Original = Get-Content -Path $Filepath -Raw
-
-    Invoke-ScriptAnalyzer -Fix -Path $Filepath -ExcludeRule PSAvoidUsingWriteHost
-    $Fixed = Get-Content -Path $Filepath -Raw
-    $Formatted = Invoke-Formatter -ScriptDefinition $Fixed
-
-    IF ($Original -eq $Formatted) {
-        $WasDirty = $false
-        return $WasDirty
-    }
-    $WasDirty = $true
-
-    # By default Set-Content unconditionally adds an *extra* newline every time
-    # See
-    #   - <https://stackoverflow.com/a/45266681/151312>
-    #   - <https://learn.microsoft.com/powershell/module/microsoft.powershell.management/set-content>
-    Set-Content -Path $Filepath $Formatted -Encoding utf8NoBom -NoNewline
-
-    return $WasDirty
-}
-
-function Repair-Recursively($Paths) {
-    $Dirty = $false
-    IF ($Paths.Length -lt 1) {
-        $Paths = , (Get-Location)
-    }
-
-    foreach ($Root in $Paths) {
-        Write-Host "Fixing ${Root}"
-        $Entry = Get-Item $Root
-
-        IF (-Not ((Test-Path -PathType Container -Path $Entry) -Or (Test-Path -PathType Leaf -Path $Entry))) {
-            $RelPath = [System.IO.Path]::GetRelativePath($Root, $Entry.FullName)
-            Write-Host "    ${Warn}SKIP${ResetColor} ${RelPath} (${Warn}not a regular file or directory${ResetColor})"
-            exit 1
-        }
-
-        $WereDirty = Repair-All $Root $Entry
-        IF ($WereDirty) {
-            $Dirty = $true
-        }
-    }
-
-    if ($Dirty) {
-        exit 1
-    }
-}
-
-Repair-Recursively $Args

pwsh-essentials/pwsh-fmt.ps1

@@ -1,90 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = "Stop"
-
-# See
-#   - <https://superuser.com/q/1264444>
-#   - <https://stackoverflow.com/a/60572643/151312>
-$Esc = [char]27
-$Warn = "${Esc}[33m"
-$Bold = "${Esc}[1m"
-$Dim = "${Esc}[2m"
-$ResetWeight = "${Esc}[22m"
-$ResetColor = "${Esc}[39m"
-
-$PwshExts = "*.ps1", "*.psm1"
-
-function Format-All($Root) {
-    $WereDirty = $false
-
-    $Children = Get-ChildItem -Path $Root -File -Recurse -Include $PwshExts
-    foreach ($Child in $Children) {
-        $Style = $Dim
-
-        $WasDirty = Format-File -Filepath $Child
-        IF ($WasDirty) {
-            $WereDirty = $true
-            $Style = $Bold
-        }
-        $RelPath = [System.IO.Path]::GetRelativePath($Root, $Child)
-        IF (Test-Path -PathType Leaf -Path $Root) {
-            $RelPath = $Root
-        }
-        Write-Host "    ${Style}${RelPath}${ResetWeight}"
-    }
-
-    return $WereDirty
-}
-
-function Format-File {
-    Param (
-        [string]$Filepath
-    )
-    $WasDirty = $false
-
-    $Original = Get-Content -Path $Filepath -Raw
-    $Formatted = Invoke-Formatter -ScriptDefinition $Original
-
-    IF ($Original -eq $Formatted) {
-        $WasDirty = $false
-        return $WasDirty
-    }
-    $WasDirty = $true
-
-    # By default Set-Content unconditionally adds an *extra* newline every time
-    # See
-    #   - <https://stackoverflow.com/a/45266681/151312>
-    #   - <https://learn.microsoft.com/powershell/module/microsoft.powershell.management/set-content>
-    Set-Content -Path $Filepath $Formatted -Encoding utf8NoBom -NoNewline
-
-    return $WasDirty
-}
-
-function Format-Recursively($Paths) {
-    $Dirty = $false
-    IF ($Paths.Length -lt 1) {
-        $Paths = , (Get-Location)
-    }
-
-    foreach ($Root in $Paths) {
-        Write-Host "Formatting ${Root}"
-        $Entry = Get-Item $Root
-
-        IF (-Not ((Test-Path -PathType Container -Path $Entry) -Or (Test-Path -PathType Leaf -Path $Entry))) {
-            $RelPath = [System.IO.Path]::GetRelativePath($Root, $Entry.FullName)
-            Write-Host "    ${Warn}SKIP${ResetColor} ${RelPath} (${Warn}not a regular file or directory${ResetColor})"
-            exit 1
-        }
-
-        $WereDirty = Format-All $Root $Entry
-        IF ($WereDirty) {
-            $Dirty = $true
-        }
-    }
-
-    if ($Dirty) {
-        exit 1
-    }
-}
-
-Format-Recursively $Args

pwsh-essentials/pwsh-lint.ps1

@@ -1,70 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = "Stop"
-
-# See
-#   - <https://superuser.com/q/1264444>
-#   - <https://stackoverflow.com/a/60572643/151312>
-$Esc = [char]27
-$Warn = "${Esc}[33m"
-$Bold = "${Esc}[1m"
-$Dim = "${Esc}[2m"
-$ResetWeight = "${Esc}[22m"
-$ResetColor = "${Esc}[39m"
-
-$PwshExts = "*.ps1", "*.psm1"
-
-function Debug-All($Root) {
-    $AreDirty = $false
-
-    $Children = Get-ChildItem -Path $Root -File -Recurse -Include $PwshExts
-    foreach ($Child in $Children) {
-        $Style = $Dim
-
-
-        $Diags = Invoke-ScriptAnalyzer -Fix -Path $Child -ExcludeRule PSAvoidUsingWriteHost
-        IF ($Diags.Length -gt 0) {
-            $AreDirty = $true
-            $Style = $Bold
-        }
-        $RelPath = [System.IO.Path]::GetRelativePath($Root, $Child)
-        IF (Test-Path -PathType Leaf -Path $Root) {
-            $RelPath = $Root
-        }
-        Write-Host "    ${Style}${RelPath}${ResetWeight}"
-        IF ($Diags.Length -gt 0) {
-            Write-Host ($Diags | Format-List | Out-String)
-        }
-    }
-
-    return $AreDirty
-}
-
-function Debug-Recursively($Paths) {
-    $Dirty = $false
-    IF ($Paths.Length -lt 1) {
-        $Paths = , (Get-Location)
-    }
-
-    foreach ($Root in $Paths) {
-        Write-Host "Linting ${Root}"
-        $Entry = Get-Item $Root
-
-        IF (-Not ((Test-Path -PathType Container -Path $Entry) -Or (Test-Path -PathType Leaf -Path $Entry))) {
-            $RelPath = [System.IO.Path]::GetRelativePath($Root, $Entry.FullName)
-            Write-Host "    ${Warn}SKIP${ResetColor} ${RelPath} (${Warn}not a regular file or directory${ResetColor})"
-            exit 1
-        }
-
-        $AreDirty = Debug-All $Root $Entry
-        IF ($AreDirty) {
-            $Dirty = $true
-        }
-    }
-
-    if ($Dirty) {
-        exit 1
-    }
-}
-
-Debug-Recursively $Args

pwsh-essentials/pwsh-run.bat

@@ -1,2 +0,0 @@
-@echo off
-powershell -ExecutionPolicy Bypass %*

pwsh/README.md

@@ -1,98 +1,11 @@
 ---
-title: Microsoft PowerShell Core
-homepage: https://docs.microsoft.com/powershell/
+title: PowerShell (pwsh alias)
+homepage: https://webinstall.dev/powershell
 tagline: |
-  PowerShell Core is a cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework.
+  Alias for https://webinstall.dev/powershell
+alias: powershell
+description: |
+  See https://webinstall.dev/powershell
 ---
 
-To update or switch versions, run `webi pwsh@stable` (or `@v7.4`, `@beta`, etc).
-
-## Cheat Sheet
-
-> The core benefit of running `pwsh` on Mac or Linux is that you get a way to
-> debug Windows scripts without having to boot up Windows.
->
-> The core benefit of running `pwsh` on Windows is that it's years ahead of
-> pre-installed version.
-
-For example, if you want to create a `curl.exe | powershell` script for Windows
-(as we do), it's helpful to be able to do some level of debugging on other
-platforms.
-
-## Table of Contents
-
-- Files
-- ProTips
-- vim
-- lint
-- fmt
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/opt/pwsh/
-~/.local/share/powershell/Modules/
-~/.local/opt/pwsh/Modules/
-```
-
-### ProTip: pwsh-essentials
-
-Friends don't let friends PowerShell without
-[pwsh-essentials](../pwsh-essentials/):
-
-- [PSScriptAnalyzer](../psscriptanalyzer/)
-- [pwsh-fmt](../pwsh-essentials/)
-- [pwsh-lint](../pwsh-essentials/)
-- [pwsh-fix](../pwsh-essentials/)
-- [pwsh-run](../pwsh-essentials/)
-
-Plus, important information for anyone **Getting Started with PowerShell**:
-
-- Case-Sensitivity
-- Returns vs Pipeline Streams
-- Strict, Trace, & Verbose Modes
-- The Call Operator "&"
-- curl vs curl.exe
-- Script Policies & Preferences
-
-### How to Use PowerShell with Vim
-
-Assuming you have [vim-ale](../vim-ale/) installed - which is included with
-[vim-essentials](../vim-essentials/) - all you need to do is install the
-`PSScriptAnalyzer` module.
-
-See the "Lint & Fmt" section below.
-
-### How to Use PowerShell with VSCode
-
-_VS Code_ should also automatically recognize and use `PSScriptAnalyzer`.
-
-### How to Lint, Fmt, & Fix ps1 Files
-
-See [pwsh-essentials](../pwsh-essentials/) for more info but, in short:
-
-```sh
-pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
-```
-
-```sh
-my_ps1='./my-file.ps1'
-pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost -Path '$my_ps1'"
-```
-
-To fmt:
-
-```sh
-my_ps1='./my-file.ps1'
-my_text="$(
-    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '$my_ps1' -Raw)"
-)"
-printf '%s\n' "${my_text}" > "${my_ps1}"
-```
-
-Note: it is _several hundred times faster_ to lint and fmt from a native
-PowerShell script than from invoking `pwsh -Command` each time.
+Alias for https://webinstall.dev/powershell

pwsh/install.ps1

@@ -1,57 +0,0 @@
-#!/usr/bin/env pwsh
-
-################
-# Install pwsh #
-################
-
-# Every package should define these variables
-$pkg_cmd_name = "pwsh"
-
-$pkg_dst_cmd = "$HOME\.local\opt\pwsh\${pkg_cmd_name}.exe"
-$pkg_dst_bin = "$HOME\.local\opt\pwsh"
-$pkg_dst_dir = "$HOME\.local\opt\pwsh"
-$pkg_dst = "$pkg_dst_dir"
-
-$pkg_src_cmd = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION\${pkg_cmd_name}.exe"
-$pkg_src_dir = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_dir"
-
-New-Item "$HOME\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$HOME\Downloads\webi\$Env:WEBI_PKG_FILE"
-
-# Fetch archive
-Invoke-DownloadURL -URL $Env:WEBI_PKG_URL -Path $pkg_download
-
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Push-Location "$HOME\.local\tmp"
-
-    # Remove any leftover tmp cruft
-    Remove-Item -Path "$pkg_src_dir" -Recurse -ErrorAction Ignore | Out-Null
-    Remove-Item -Path "$HOME\.local\tmp\pwsh*" -Recurse -ErrorAction Ignore
-
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    New-Item ".\pwsh-v$Env:WEBI_VERSION" -ItemType Directory -Force | Out-Null
-    Push-Location ".\pwsh-v$Env:WEBI_VERSION"
-    Write-Output "    Unpacking $pkg_download"
-    & tar xf "$pkg_download"
-    Pop-Location
-
-    # Settle unpacked archive into place
-    # TODO if .\pwsh-v$Env:WEBI_VERSION\pwsh*\ exists,
-    # then the nesting of the archive has changed
-    # so move either .\pwsh-v$Env:WEBI_VERSION\pwsh*\
-    # or .\pwsh-v$Env:WEBI_VERSION\ accordingly
-    Move-Item -Path ".\pwsh-v$Env:WEBI_VERSION" -Destination "$pkg_src_dir"
-    Write-Output "    into ${TPath}${pkg_src_dir}${TReset}"
-
-    Pop-Location
-}
-
-Write-Output "    Copying ${TDim}${pkg_src}${TReset}"
-Write-Output "      into ${TPath}${pkg_dst}${TReset}"
-Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore | Out-Null
-Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
-webi_path_add "$pkg_dst_bin"
-
-& "$pkg_dst_cmd" -V

pwsh/install.sh

@@ -2,52 +2,10 @@
 set -e
 set -u
 
-__init_pwsh() {
-
-    pkg_cmd_name="pwsh"
-
-    # note: no ./bin prefix
-    pkg_src_cmd="$HOME/.local/opt/pwsh-v$WEBI_VERSION/pwsh"
-    pkg_src_dir="$HOME/.local/opt/pwsh-v$WEBI_VERSION/"
-    pkg_src="$HOME/.local/opt/pwsh-v$WEBI_VERSION/"
-
-    pkg_dst_cmd="$HOME/.local/opt/pwsh/pwsh"
-    pkg_dst_dir="$HOME/.local/opt/pwsh"
-    pkg_dst="$HOME/.local/opt/pwsh"
-
-    pkg_get_current_version() {
-        # 'pwsh --version' has output in this format:
-        #       PowerShell 7.0.2
-        # This trims it down to just the version number:
-        #       7.0.2
-        pwsh --version 2> /dev/null | head -n 1 | cut -d' ' -f2
-    }
-
-    pkg_install() {
-        # mv ./* "$HOME/.local/opt/pwsh-v7.0.2"
-        mkdir -p "$pkg_src"
-        mv ./* "$pkg_src"
-
-        # symlink pwsh as powershell
-        (
-            cd "$pkg_src" > /dev/null
-            rm -rf powershell
-            ln -s pwsh powershell
-        )
-    }
-
-    pkg_link() {
-        # rm -f "$HOME/.local/opt/pwsh"
-        rm -rf "$pkg_dst"
-
-        # ln -s "$HOME/.local/opt/pwsh-v7.0.2" "$HOME/.local/opt/pwsh"
-        ln -s "$pkg_src" "$pkg_dst"
-    }
-
-    pkg_done_message() {
-        echo "Installed 'pwsh' at $pkg_dst"
-        pwsh -V
-    }
+__redirect_alias_powershell() {
+    echo "'pwsh@${WEBI_TAG:-stable}' is an alias for 'powershell@${WEBI_VERSION-}'"
+    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+    curl -fsSL "$WEBI_HOST/powershell@${WEBI_VERSION-}" | sh
 }
 
-__init_pwsh
+__redirect_alias_powershell

rg/releases.js

@@ -6,7 +6,6 @@ var repo = 'ripgrep';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['ripgrep', 'rg'];
     return all;
   });
 };

ripgrep/install.ps1

@@ -1,3 +1,3 @@
 Write-Output "'ripgrep@$Env:WEBI_TAG' is an alias for 'rg@$Env:WEBI_VERSION'"
 IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
-curl.exe -A MS -fsSL "$Env:WEBI_HOST/rg@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/rg@$Env:WEBI_VERSION" | powershell

sass/releases.js

@@ -6,7 +6,6 @@ var repo = 'dart-sass';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['dart-sass', 'sass'];
     return all;
   });
 };

sqlpkg/releases.js

@@ -6,7 +6,6 @@ var repo = 'sqlpkg-cli';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['sqlpkg-cli', 'sqlpkg'];
     return all;
   });
 };

ssh-adduser/ssh-adduser

@@ -61,7 +61,7 @@ main() {
     sudo -i -u "$my_new_user" sh -c "curl -fsSL '$WEBI_HOST/ssh-pubkey' | sh > /dev/null" ||
         sudo -i -u "$my_new_user" sh -c "wget -q -O - '$WEBI_HOST/ssh-pubkey' | sh > /dev/null"
 
-    if test -z "${SSH_ADDUSER_AUTO:-}"; then
+    if test -z "${SSH_ADDUSER_AUTO}"; then
         echo ""
         echo "!! BREAKING CHANGE !!"
         echo ""

ssh-authorize/README.md

@@ -14,9 +14,6 @@ install:
 ~/.config/envman/PATH.env
 ~/.local/bin/ssh-authorize
 ~/.ssh/authorized_keys
-
-# Windows
-$Env:ProgramData\ssh\administrators_authorized_keys
 ```
 
 ## Cheat Sheet
@@ -51,7 +48,7 @@ LOCAL IDENTIFY FILES
     /home/app/.ssh/id_rsa.pub
 ```
 
-### How to Add SSH Public Keys Manually
+### How to Add Manually
 
 For the simplest case it seems almost silly to even have a utility for this:
 
@@ -67,20 +64,9 @@ curl https://github.com/me.keys >> ~/.ssh/authorized_keys
 
 but... tedium, error checking... things are never as simple as they seem.
 
-### How to use on Windows
-
-You will need to run from an Elevated PowerShell, or use the
-[Windows sudo](../sudo/).
-
-### Why use ssh-authorize at all?
-
-At first blush it seems easy enough to just add download or add files to
-`~/.ssh/authorized_keys`, but there are complexities (especially on _Windows_).
-
-This just adds a layer of convenience, and a few benefits:
+### But really, why?
 
 - handles arbitrary files and URLs, failing bad key lines
-- sets permissions correctly, even if they were incorrect \
-  (which almost no one will to do successfully by hand on Windows on the first try)
+- sets permissions correctly, even if they were incorrect
 - works `curl` (macOS, Ubuntu) or `wget` (Docker, Alpine)
 - enforces `https`

ssh-authorize/install.ps1

@@ -1,28 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = 'stop'
-
-function Install-WebiHostedScript () {
-    Param(
-        [string]$Package,
-        [string]$ScriptName
-    )
-    $PwshName = "_${ScriptName}.ps1"
-    $PwshUrl = "${Env:WEBI_HOST}/packages/${Package}/${ScriptName}.ps1"
-    $PwshPath = "$HOME\.local\bin\${PwshName}"
-    $OldPath = "$HOME\.local\bin\${ScriptName}.ps1"
-
-    $BatPath = "$HOME\.local\bin\${ScriptName}.bat"
-    $PwshExec = "powershell -ExecutionPolicy Bypass"
-    $Bat = "@echo off`r`n$PwshExec %USERPROFILE%\.local\bin\${PwshName} %*"
-
-    Invoke-DownloadUrl -Force -URL $PwshUrl -Path $PwshPath
-    Set-Content -Path $BatPath -Value $Bat
-    Write-Host "    Created alias ${BatPath}"
-    Write-Host "      to run ${PwshPath}"
-
-    # fix for old installs
-    Remove-Item -Path $OldPath -Force -ErrorAction Ignore
-}
-
-Install-WebiHostedScript -Package "ssh-authorize" -ScriptName "ssh-authorize"

ssh-authorize/ssh-authorize.ps1

@@ -1,260 +0,0 @@
-#!/usr/bin/env pwsh
-
-# set -e
-$ErrorActionPreference = "Stop"
-
-# set -x
-#Set-PSDebug -Trace 2
-#$VerbosePreference="Continue"
-
-$AdminAuthorizedKeys = "${Env:ProgramData}\ssh\administrators_authorized_keys"
-
-function Repair-AuthorizedKeyPermission {
-    Write-Verbose "Setting ssh file permissions ..."
-    Repair-AdminAuthorizedKeyPermission
-    Repair-UserAuthorizedKeyPermission
-    Write-Verbose "All permissions set."
-}
-
-function Repair-AdminAuthorizedKeyPermission {
-    Write-Verbose "Setting permissions on `$Env:ProgramData\ssh\ ..."
-
-    # add self for the purposes of this script
-    icacls.exe "${Env:ProgramData}\ssh\" `
-        /t /grant "${Env:UserName}:(F)"
-
-    # Create whitelist for 'sudoer' authorized keys
-    IF (-Not (Test-Path -Path $AdminAuthorizedKeys)) {
-        $null = New-Item -Path $AdminAuthorizedKeys -Type 'File'
-    }
-
-    # chmod -R go-rwx /etc/ssh/
-    # (remove inherited acls)
-    icacls.exe "${Env:ProgramData}\ssh\" /t /inheritance:r
-    icacls.exe "${Env:ProgramData}\ssh\" /remove "Authenticated Users"
-
-    # chown -R root:wheel
-    # (add admins and system back with perms to inherit new files)
-    icacls.exe "${Env:ProgramData}\ssh\" `
-        /grant "Administrators:(OI)(CI)(F)" `
-        /grant "SYSTEM:(OI)(CI)(F)"
-    icacls.exe $AdminAuthorizedKeys `
-        /grant "Administrators:(F)" `
-        /grant "SYSTEM:(F)"
-    icacls.exe "${Env:ProgramData}\ssh\logs" `
-        /grant "Administrators:(F)" `
-        /grant "SYSTEM:(F)"
-
-    # (explicitly add public access to special files)
-    icacls.exe "${Env:ProgramData}\ssh\" `
-        /grant "Authenticated Users:(RX)"
-    icacls.exe "${Env:ProgramData}\ssh\sshd.pid" `
-        /grant "Administrators:(F)" `
-        /grant "SYSTEM:(F)" `
-        /grant "Authenticated Users:(RX)"
-    icacls.exe "${Env:ProgramData}\ssh\sshd_config" `
-        /grant "Administrators:(F)" `
-        /grant "SYSTEM:(F)" `
-        /grant "Authenticated Users:(RX)"
-
-    # add self for the purposes of this script
-    icacls.exe "${Env:ProgramData}\ssh\" /t /remove "${Env:UserName}"
-
-    Write-Verbose "System permissions set."
-}
-
-function Repair-UserAuthorizedKeyPermission {
-    Write-Verbose "Setting permissions on `$HOME\.ssh\ ..."
-
-    # mkdir -p ~/.ssh/
-    $null = New-Item -Type Directory -Force -Path "$HOME\.ssh\"
-
-    # touch ~/.ssh/authorized_keys
-    IF (-Not (Test-Path -Path "$HOME\.ssh\authorized_keys")) {
-        $null = New-Item -Type 'File' -Path "$HOME\.ssh\authorized_keys"
-    }
-
-    # chown -R "$(id -u -n)":"$(id -u -n)"
-    # (add yourself as a non-inherited user)
-    icacls.exe "$HOME\.ssh\" /t /grant "${Env:UserName}:(F)"
-
-    # chmod -R go-rwx ~/.ssh/
-    # (remove inherited acls)
-    icacls.exe "$HOME\.ssh\" /t /inheritance:r
-
-    Write-Verbose "User permissions set."
-}
-
-# Clean up non-key lines, preserving comments and newlines
-function Repair-AuthorizedKeyFile($Path) {
-    Write-Verbose "Filtering invalid keys entries from ${Path} ...";
-
-    $HasBadLine = $false;
-    $FixedPath = "${Path}.fixed.txt";
-
-    # truncates or creates the file
-    $null = New-Item -Type 'File' -Force -Path $FixedPath
-    foreach ($Line in [System.IO.File]::ReadLines($Path)) {
-        $Line = $Line.Trim()
-        IF ($Line.Length -eq 0) {
-            $null = Add-Content -Path $FixedPath -Value $Line
-            continue
-        }
-        IF ($Line.StartsWith('#')) {
-            $null = Add-Content -Path $FixedPath -Value $Line
-            continue
-        }
-        IF ($Line.StartsWith('ssh-')) {
-            $null = Add-Content -Path $FixedPath -Value $Line
-            continue
-        }
-        IF ($Line.StartsWith('ecdsa-')) {
-            $null = Add-Content -Path $FixedPath -Value $Line
-            continue
-        }
-        if (-Not $HasBadLine) {
-            $HasBadLine = $true
-            Write-Host "Skipping lines that do not begin with ssh-, ecdsa- or #:" -ForegroundColor Red -BackgroundColor Black
-        }
-        Write-Host "    $Line" -ForegroundColor Yellow -BackgroundColor Black
-    }
-
-    IF ($HasBadLine) {
-        Write-Host "Unrecognized line formats were filtered out."
-
-        $FixedPath
-        Return
-    }
-
-    Write-Verbose "No invalid keys were filtered out."
-    $null = Remove-Item -Path $FixedPath -Force -ErrorAction Ignore
-
-    $Path
-}
-
-function Add-AuthorizedKeyFile($Path) {
-    # Give yourself permission to the admin authorized_keys file
-    icacls.exe $AdminAuthorizedKeys /grant "${Env:UserName}:(F)"
-
-    Get-Content $Path | Add-Content -Path $AdminAuthorizedKeys
-
-    # Remove your permission to the admin authorized_keys file
-    icacls.exe $AdminAuthorizedKeys /remove $Env:UserName | Out-Null
-
-    Get-Content $Path | Add-Content -Path "$HOME\.ssh\authorized_keys"
-}
-
-function Add-AuthorizedKey($UrlOrPath) {
-    Write-Verbose "Inspecting ${UrlOrPath}..."
-
-    $IsHttp = $UrlOrPath.StartsWith("HTTP://", 'CurrentCultureIgnoreCase')
-    $IsHttps = $UrlOrPath.StartsWith("HTTPS://", 'CurrentCultureIgnoreCase')
-
-    IF (Test-Path -Path $UrlOrPath -Type 'Leaf') {
-        $FixedPath = Repair-AuthorizedKeyFile $UrlOrPath
-        $null = Add-AuthorizedKeyFile $FixedPath
-
-        $IsTmp = $UrlOrPath.EndsWith(".TMP.TXT", 'CurrentCultureIgnoreCase')
-        IF ($IsTmp) {
-            $null = Remove-Item -Path "${TmpKeys}.tmp.txt" -Force -ErrorAction Ignore
-        }
-        Return
-    }
-    IF (-Not ($IsHttps -Or $IsHttp)) {
-        throw "'$UrlOrPath' does not exist as a file and doesn't look like a URL (no https://)"
-    }
-
-    $TmpKeys = "new_authorized_keys.tmp.txt"
-
-    curl.exe -f -sS $UrlOrPath | Out-File -Force "${TmpKeys}.partial"
-    $null = Move-Item -Force "${TmpKeys}.partial" $TmpKeys
-
-    IF ($IsHttp) {
-        Write-Host ""
-        Write-Host "Error: Cowardly refusing to add file downloaded over plain http" -ForegroundColor Yellow -BackgroundColor black
-        Write-Host ""
-        Write-Host "Please manually inspect ${TmpKeys} and then run"
-        Write-Host "    ssh-authorize ${TmpKeys}" -ForegroundColor Yellow -BackgroundColor black
-        Write-Host ""
-        1
-        Return
-    }
-
-    $FixedPath = Repair-AuthorizedKeyFile $TmpKeys
-    $null = Add-AuthorizedKeyFile $FixedPath
-    $null = Remove-Item -Path $TmpKeys -Force -ErrorAction Ignore
-    $null = Remove-Item -Path $FixedPath -Force -ErrorAction Ignore
-}
-
-function Debug-AuthorizedKeyPermission {
-    Write-Verbose "Showing ssh file permissions ..."
-
-    # ls -lA /etc/sshd/
-    icacls.exe "${Env:ProgramData}\ssh\" /t | Write-Host
-
-    # ls -lA ~/.ssh/
-    icacls.exe "$HOME\.ssh\" /t | Write-Host
-
-    # if you really mess things up you can
-    # move the 'ssh' and '.ssh' folders into
-    # '$HOME\AppData\Local\Temp' and reboot
-
-    Write-Verbose "All ssh file permissions shown."
-}
-
-function Show-Help() {
-    Write-Host ""
-    Write-Host "USAGE"
-    Write-Host "    ssh-authorize <url-or-path>" -ForegroundColor Yellow -BackgroundColor black
-    Write-Host ""
-    Write-Host "EXAMPLES"
-    Write-Host "    ssh-authorize https://github.com/johndoe.keys"
-    Write-Host "    ssh-authorize http://192.168.1.101:3000/authorized_keys"
-    Write-Host "    ssh-authorize ./alice.pub.txt ./bob.pub.txt"
-    Write-Host ""
-    Write-Host "LOCAL IDENTIFY FILES"
-    $Pubs = Get-ChildItem -Path "$HOME\.ssh\" -Filter '*.pub'
-    IF ($Pubs.Length -eq 0) {
-        Write-Host "    (no files match ~/.ssh/*.pub)"
-    }
-    foreach ($Pub in $Pubs) {
-        $RelPath = [System.IO.Path]::GetRelativePath($HOME, $Pub.FullName)
-        Write-Host "    ${RelPath}"
-    }
-}
-
-function Main($Paths) {
-    $null = Repair-AuthorizedKeyPermission
-    #Debug-AuthorizedKeyPermission | Write-Host
-
-    if ($Paths.Length -eq 0 -Or $Paths[0] -eq "help" -Or $Paths[0] -eq "--help") {
-        Show-Help | Write-Host
-
-        Write-Host ""
-        IF ($Paths.Length -eq 0) {
-            1
-            Return
-        }
-
-        0
-        Return
-    }
-    $Uri = $Paths[0]
-
-    Write-Host ""
-    Write-Host "Fetching keys from ${Uri}"
-
-    $null = Add-AuthorizedKey $Uri
-
-    Write-Host ""
-    Write-Host "Successfully copied the given ssh keys into:"
-    Write-Host "    `$HOME\.ssh\authorized_keys"
-    Write-Host "    `${Env:ProgramData}\ssh\administrators_authorized_keys"
-    Write-Host ""
-
-    0
-    Return
-}
-
-$Status = Main $Args
-Exit $Status

ssh-pubkey/install.ps1

@@ -1,28 +1,11 @@
 #!/usr/bin/env pwsh
 
-$ErrorActionPreference = 'stop'
+$MY_CMD = "ssh-pubkey"
 
-function Install-WebiHostedScript () {
-    Param(
-        [string]$Package,
-        [string]$ScriptName
-    )
-    $PwshName = "_${ScriptName}.ps1"
-    $PwshUrl = "${Env:WEBI_HOST}/packages/${Package}/${ScriptName}.ps1"
-    $PwshPath = "$HOME\.local\bin\${PwshName}"
-    $OldPath = "$HOME\.local\bin\${ScriptName}.ps1"
+& curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_HOST/packages/$MY_CMD/$MY_CMD.ps1" -o "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1.part"
+Remove-Item -Path "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1" -Recurse -ErrorAction Ignore
+& Move-Item "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1.part" "$Env:USERPROFILE\.local\bin\$MY_CMD.ps1"
+Set-Content -Path "$Env:USERPROFILE\.local\bin\$MY_CMD.bat" -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\$MY_CMD.ps1 %1`r`npopd"
 
-    $BatPath = "$HOME\.local\bin\${ScriptName}.bat"
-    $PwshExec = "powershell -ExecutionPolicy Bypass"
-    $Bat = "@echo off`r`n$PwshExec %USERPROFILE%\.local\bin\${PwshName} %*"
-
-    Invoke-DownloadUrl -Force -URL $PwshUrl -Path $PwshPath
-    Set-Content -Path $BatPath -Value $Bat
-    Write-Host "    Created alias ${BatPath}"
-    Write-Host "      to run ${PwshPath}"
-
-    # fix for old installs
-    Remove-Item -Path $OldPath -Force -ErrorAction Ignore
-}
-
-Install-WebiHostedScript -Package "ssh-pubkey" -ScriptName "ssh-pubkey"
+# run the command
+& "$Env:USERPROFILE\.local\bin\$MY_CMD.bat"