WIP feroxbuster

WIP: psscriptanalyzer
doc(pwsh): update modules dirs, add ToC
2026-06-05 15:32:51 +00:00 · 2023-11-07 09:43:36 -07:00 · 2023-11-07 09:43:36 -07:00 · 2023-11-07 09:43:36 -07:00 · 2023-11-07 09:43:35 -07:00
60 changed files with 823 additions and 1910 deletions
--- a/_webi/curl-pipe-bootstrap.tpl.ps1
+++ b/_webi/curl-pipe-bootstrap.tpl.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 }}"
--- a/_webi/bootstrap.sh
+++ b/_webi/bootstrap.sh
@@ -0,0 +1,359 @@
+#!/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
+
+    my_libc=''
+    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
+        my_libc='musl'
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
+        my_libc='gnu'
+    else
+        my_libc='libc'
+    fi
+
+    if test -z "$WEBI_WELCOME"; then
+        echo ""
+        printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s (%s) %s\e[0m'.\n" "${WEBI_PKG:-"Unknown Package"}" "$(uname -s)" "${my_libc:-"Unknown Libc"}" "$(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'
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
+        my_libc='gnu'
+    else
+        my_libc='libc'
+    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
--- a/_webi/curl-pipe-bootstrap.tpl.sh
+++ b/_webi/curl-pipe-bootstrap.tpl.sh
@@ -1,243 +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 #
-#                                       #
-#########################################
-
-# shellcheck disable=SC2005
-fn_show_welcome() { (
-    echo ""
-    printf "%s %s\n" \
-        "$(t_strong 'Welcome to') $(t_stronger 'Webi')$(t_strong '!')" \
-        "$(t_dim "- Modern tools, instant installs.")"
-    echo "We expect your experience to be $(t_em 'absolutely perfect')!"
-    echo ""
-    echo "    $(t_yellow 'Have a problem?') Please $(t_em 'let us know'):"
-    echo "        $(t_url 'https://github.com/webinstall/webi-installers/issues')"
-    echo "        $(t_dim "(your system is $(t_yellow "$(uname -s)")/$(t_yellow "$(uname -m)") with $(t_yellow "$(fn_get_libc)") & $(t_yellow "$(fn_get_http)"))")"
-    echo ""
-    echo "    $(t_yellow 'Love it?') Star it!"
-    echo "        $(t_url 'https://github.com/webinstall/webi-installers')"
-
-    sleep 0.2
-); }
-
-t_strong() { (printf '\e[36m%s\e[39m' "${1}"); }
-t_stronger() { (printf '\e[1m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_url() { (printf '\e[2m%s\e[22m' "${1}"); }
-t_path() { (printf '\e[2m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_cmd() { (printf '\e[2m\e[35m%s\e[39m\e[22m' "${1}"); }
-t_err() { (printf '\e[31m%s\e[39m' "${1}"); }
-
-t_bold() { (printf '\e[1m%s\e[22m' "${1}"); }
-t_dim() { (printf '\e[2m%s\e[22m' "${1}"); }
-t_em() { (printf '\e[3m%s\e[23m' "${1}"); }
-t_under() { (printf '\e[4m%s\e[24m' "${1}"); }
-t_green() { (printf '\e[32m%s\e[39m' "${1}"); }
-t_yellow() { (printf '\e[33m%s\e[39m' "${1}"); }
-t_magenta() { (printf '\e[35m%s\e[39m' "${1}"); }
-t_cyan() { (printf '\e[36m%s\e[39m' "${1}"); }
-
-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() { (
-    # 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}"
-); }
-
-###################################
-#                                 #
-#       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 -q --user-agent"
-    if fn_is_interactive; then
-        cmd_wget="wget -q --show-progress --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}" -c "${a_url}" -O "${a_path}"; then
-        echo >&2 "    $(t_err "failed to download (wget)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_wget '${b_agent}' -c '${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 --fail-with-body -sSL -#"
-    if fn_is_interactive; then
-        cmd_curl="curl --fail-with-body 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_is_interactive() {
-    # Ex:
-    #     himBH
-    #     hBc
-    case $- in
-        *i*) return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
-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 wget > /dev/null; then
-        fn_wget "${a_url}" "${a_path}.part"
-    elif command -v curl > /dev/null; then
-        fn_curl "${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}"
-
-    echo ""
-    echo "$(t_strong 'Bootstrapping') $(t_stronger 'Webi')"
-
-    b_path_rel="$(fn_sub_home "${a_path}")"
-    b_checksum=""
-    if test -r "${a_path}"; then
-        echo "    $(t_dim 'Found') $(t_path "${b_path_rel}")"
-        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"
-    if test -r "${a_path}"; then
-        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}"
-); }
-
-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
-}
-
-fn_sub_home() { (
-    my_rel=${HOME}
-    my_abs=${1}
-    echo "${my_abs}" | sed "s:^${my_rel}:~:"
-); }
-
-main() { (
-    fn_show_welcome
-    export WEBI_WELCOME=true
-
-    # 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_upgrade "${b_webi_path}"
-
-    echo ""
-    echo "$(t_strong 'Installing') $(t_stronger "${WEBI_PKG}") $(t_strong '...')"
-    echo "    Running $(t_cmd "${b_webi_path_rel} ${WEBI_PKG}")"
-    "${b_webi_path}" "${WEBI_PKG}"
-); }
-
-set -e
-set -u
-main
--- a/_webi/normalize.js
+++ b/_webi/normalize.js
@@ -50,7 +50,7 @@ var arches = [
 // https://git.com/org/foo/releases/v0.7.9/foo-x86_64-linux-musl.tar.gz
 //
 var archMap = {
-  armv7l: /(\b|_)(arm32|armv?7l?)/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,
--- a/_webi/serve-installer.js
+++ b/_webi/serve-installer.js
@@ -128,8 +128,8 @@ Installers.helper = async function ({ ua, pkg, tag, formats, libc }) {
  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 CURL_PIPE_PS1_BOOT = path.join(__dirname, 'bootstrap.ps1');
+var CURL_PIPE_SH_BOOT = path.join(__dirname, 'bootstrap.sh');
 var BAD_SH_RE = /[<>'"`$\\]/;

 Installers.getPosixCurlPipeBootstrap = async function ({ baseurl, pkg, ver }) {
--- a/_webi/install-package.tpl.ps1
+++ b/_webi/install-package.tpl.ps1
@@ -1,6 +1,18 @@
 #!/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)
@@ -32,73 +44,6 @@ New-Item -Path "$Env:USERPROFILE\.local\opt" -ItemType Directory -Force | Out-Nu
 # {{ 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 '-#' --fail-with-body -sS -A $Env:WEBI_UA $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
@@ -113,7 +58,7 @@ function webi_path_add($pathname) {
    $my_pathname = $my_pathname -ireplace $my_home_re, "%USERPROFILE%"

    $all_user_paths = [Environment]::GetEnvironmentVariable("Path", "User")
-    $user_paths = "${all_user_paths}".Trim(';').Split(';')
+    $user_paths = $all_user_paths -Split (';')
    $exists_in_path = $false
    foreach ($user_path in $user_paths) {
        # C:\Users\me\bin => %USERPROFILE%/bin
@@ -125,21 +70,48 @@ function webi_path_add($pathname) {
        }
    }
    if (-Not $exists_in_path) {
-        $all_user_paths = "${pathname};${all_user_paths}".Trim(';')
+        $all_user_paths = $pathname + ";" + $all_user_paths
        [Environment]::SetEnvironmentVariable("Path", $all_user_paths, "User")
-        $null = Sync-EnvPath
+    }
+
+    $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 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
-}
+function webi_path_add_followup($pathname) {
+    $my_cmd = 'PATH ' + "$pathname" + ';%PATH%'
+    $my_pwsh = '$Env:Path = "' + "$pathname" + ';$Env:Path"'

-$Env:WEBI_UA = Get-UserAgent
+    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)
--- a/_webi/install-package.tpl.sh
+++ b/_webi/install-package.tpl.sh
@@ -14,7 +14,6 @@ __bootstrap_webi() {
    else
        my_libc='libc'
    fi
-    WEBI_UA="$(uname -s)/$(uname -r) $(uname -m)/unknown ${my_libc}"

    #WEBI_PKG=
    #PKG_NAME=
@@ -68,20 +67,6 @@ __bootstrap_webi() {
    mkdir -p "$HOME/.local/bin"
    mkdir -p "$HOME/.local/opt"

-    if test -e ~/.local/bin; then
-        echo "Found ~/.local/bin"
-    else
-        echo "Creating ~/.local/bin"
-        mkdir -p "$HOME/.local/bin"
-    fi
-
-    if test -e ~/.local/bin/webi; then
-        echo "Found ~/.local/bin/webi"
-    else
-        echo "Creating ~/.local/bin"
-        mkdir -p "$HOME/.local/bin"
-    fi
-
    ##
    ## Detect http client
    ##
@@ -207,8 +192,14 @@ __bootstrap_webi() {
    is_interactive_shell() {
        # $- shows shell flags (error,unset,interactive,etc)
        case $- in
-            *i*) return 0 ;;
-            *) return 1 ;;
+            *i*)
+                # true
+                return 0
+                ;;
+            *)
+                # false
+                return 1
+                ;;
        esac
    }

--- a/_webi/ua-detect.js
+++ b/_webi/ua-detect.js
@@ -67,7 +67,7 @@ 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/i.test(ua)) {
    return 'armv6l';
--- a/_webi/webi-pwsh.ps1
+++ b/_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 msvc"
+$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&libc=msvc"
+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
--- a/archiver/install.ps1
+++ b/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
--- a/bat/install.ps1
+++ b/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
--- a/bat/install.sh
+++ b/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
--- a/caddy/README.md
+++ b/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
--- a/curlie/install.ps1
+++ b/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
--- a/curlie/install.sh
+++ b/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"
--- a/deno/install.sh
+++ b/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"
 }
--- a/fd/install.ps1
+++ b/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
--- a/feroxbuster/README.md
+++ b/feroxbuster/README.md
@@ -0,0 +1,47 @@
+---
+title: feroxbuster
+homepage: https://github.com/epi052/feroxbuster
+tagline: |
+  feroxbuster: A tool designed to perform Forced Browsing.
+---
+
+To update or switch versions, run `webi feroxbuster@stable` (or `@v2`, `@beta`,
+etc).
+
+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```text
+~/.config/feroxbuster/ferox-config.toml
+~/.local/bin/feroxbuster
+```
+
+## Cheat Sheet
+
+> `feroxbuster` is a tool designed for Forced Browsing. Forced browsing is an
+> attack where the aim is to enumerate and access resources that are not
+> referenced by the web application but are still accessible by an attacker.
+
+To run feroxbuster:
+
+```sh
+feroxbuster -u [target]
+```
+
+### Include Headers
+
+To run feroxbuster with custom headers:
+
+```sh
+feroxbuster -u [target] -H Accept:application/json "Authorization: Bearer {token}"
+```
+
+### Proxy Traffic Through Burp
+
+To proxy traffic through Burp:
+
+```sh
+feroxbuster -u [target] --insecure --proxy http://127.0.0.1:8080
+```
--- a/feroxbuster/install.ps1
+++ b/feroxbuster/install.ps1
@@ -0,0 +1,55 @@
+#!/usr/bin/env pwsh
+
+#######################
+# Install feroxbuster #
+#######################
+
+# Every package should define these variables
+$pkg_cmd_name = "feroxbuster"
+
+$pkg_dst_cmd = "$Env:USERPROFILE\.local\bin\feroxbuster.exe"
+$pkg_dst = "$pkg_dst_cmd"
+
+$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\feroxbuster-v$Env:WEBI_VERSION\bin\feroxbuster.exe"
+$pkg_src_bin = "$Env:USERPROFILE\.local\opt\feroxbuster-v$Env:WEBI_VERSION\bin"
+$pkg_src_dir = "$Env:USERPROFILE\.local\opt\feroxbuster-v$Env:WEBI_VERSION"
+$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")) {
+    Write-Host "Downloading feroxbuster from $Env:WEBI_PKG_URL to $pkg_download"
+    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
+    & move "$pkg_download.part" "$pkg_download"
+}
+
+IF (!(Test-Path -Path "$pkg_src_cmd")) {
+    Write-Verbose "Installing feroxbuster"
+
+    # TODO: create package-specific temp directory
+    # Enter tmp
+    pushd .local\tmp
+
+    # Remove any leftover tmp cruft
+    Remove-Item -Path ".\feroxbuster-v*" -Recurse -ErrorAction Ignore
+    Remove-Item -Path ".\feroxbuster.exe" -Recurse -ErrorAction Ignore
+
+    # Unpack archive file into this temporary directory
+    # Windows BSD-tar handles zip. Imagine that.
+    Write-Verbose "Unpacking $pkg_download"
+    & tar xf "$pkg_download"
+
+    # Settle unpacked archive into place
+    Write-Verbose "Install Location: $pkg_src_cmd"
+    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
+    Move-Item -Path ".\feroxbuster-*\feroxbuster.exe" -Destination "$pkg_src_bin"
+
+    # Exit tmp
+    popd
+}
+
+Write-Host "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
--- a/feroxbuster/install.sh
+++ b/feroxbuster/install.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# shellcheck disable=SC2034
+# "'pkg_cmd_name' appears unused. Verify it or export it."
+
+__init_feroxbuster() {
+    set -e
+    set -u
+
+    ##################
+    # Install feroxbuster #
+    ##################
+
+    # Every package should define these 6 variables
+    pkg_cmd_name="feroxbuster"
+
+    pkg_dst_cmd="$HOME/.local/bin/feroxbuster"
+    pkg_dst="$pkg_dst_cmd"
+
+    pkg_src_cmd="$HOME/.local/opt/feroxbuster-v$WEBI_VERSION/bin/feroxbuster"
+    pkg_src_dir="$HOME/.local/opt/feroxbuster-v$WEBI_VERSION"
+    pkg_src="$pkg_src_cmd"
+
+    # pkg_install must be defined by every package
+    pkg_install() {
+        # ~/.local/opt/feroxbuster-v0.99.9/bin
+        mkdir -p "$(dirname "${pkg_src_cmd}")"
+
+        # mv ./feroxbuster-*/feroxbuster ~/.local/opt/feroxbuster-v0.99.9/bin/feroxbuster
+        mv ./feroxbuster "${pkg_src_cmd}"
+    }
+
+    # pkg_get_current_version is recommended, but not required
+    pkg_get_current_version() {
+        # 'feroxbuster --version' has output in this format:
+        #       feroxbuster 0.99.9 (rev abcdef0123)
+        # This trims it down to just the version number:
+        #       0.99.9
+        feroxbuster --version 2> /dev/null |
+            head -n 1 |
+            cut -d ' ' -f 2
+    }
+
+}
+
+__init_feroxbuster
--- a/feroxbuster/releases.js
+++ b/feroxbuster/releases.js
@@ -0,0 +1,20 @@
+'use strict';
+
+var github = require('../_common/github.js');
+var owner = 'epi052';
+var repo = 'feroxbuster';
+
+module.exports = function (request) {
+  return github(request, owner, repo).then(function (all) {
+    return all;
+  });
+};
+
+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);
+    console.info(JSON.stringify(all, null, 2));
+  });
+}
--- a/fzf/install.ps1
+++ b/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
--- a/git-gpg-init/install.ps1
+++ b/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
--- a/go-essentials/install.ps1
+++ b/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
--- a/go/install.ps1
+++ b/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
--- a/golang/install.ps1
+++ b/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
--- a/gpg-pubkey/install.ps1
+++ b/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"
--- a/iterm2-utils/install.sh
+++ b/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
--- a/jq/install.ps1
+++ b/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
--- a/myip/install.ps1
+++ b/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"
--- a/powershell/README.md
+++ b/powershell/README.md
@@ -11,18 +11,14 @@ To update or switch versions, run `webi pwsh@stable` (or `@v7.4`, `@beta`, etc).

 > 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.
+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.

 ## Table of Contents

 - Files
- ProTips
 - vim
 - lint
 - fmt
@@ -39,26 +35,6 @@ install:
 ~/.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
@@ -71,17 +47,20 @@ See the "Lint & Fmt" section below.

 _VS Code_ should also automatically recognize and use `PSScriptAnalyzer`.

-### How to Lint, Fmt, & Fix ps1 Files
+### How to Lint & Fmt ps1 Files

-See [pwsh-essentials](../pwsh-essentials/) for more info but, in short:
+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 -Path '$my_ps1'"
+pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost, PSUseDeclaredVarsMoreThanAssignment -Path \"$my_ps1\""
 ```

 To fmt:
@@ -89,7 +68,7 @@ To fmt:
 ```sh
 my_ps1='./my-file.ps1'
 my_text="$(
-    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '$my_ps1' -Raw)"
+    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path \"$my_ps1\" -Raw)"
 )"
 printf '%s\n' "${my_text}" > "${my_ps1}"
 ```
--- a/powershell/install.ps1
+++ b/powershell/install.ps1
@@ -1,56 +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
--- a/powershell/install.sh
+++ b/powershell/install.sh
@@ -39,7 +39,6 @@ __init_powershell() {

    pkg_done_message() {
        echo "Installed 'pwsh' at $pkg_dst"
-        pwsh -V
    }
 }

--- a/psscriptanalyzer/README.md
+++ b/psscriptanalyzer/README.md
@@ -9,202 +9,17 @@ 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
+~/.local/share/powershell/Modules/
 ```

 ## 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
-
+Get-Module -ListAvailable
 ```
--- a/psscriptanalyzer/install.ps1
+++ b/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
--- a/psscriptanalyzer/install.sh
+++ b/psscriptanalyzer/install.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 set -e
-set -u
+set -x

 __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
--- a/pwsh-essentials/README.md
+++ b/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.
--- a/pwsh-essentials/install.ps1
+++ b/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
--- a/pwsh-essentials/install.sh
+++ b/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
--- a/pwsh-essentials/pwsh-fix.ps1
+++ b/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
--- a/pwsh-essentials/pwsh-fmt.ps1
+++ b/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
--- a/pwsh-essentials/pwsh-lint.ps1
+++ b/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
--- a/pwsh-essentials/pwsh-run.bat
+++ b/pwsh-essentials/pwsh-run.bat
@@ -1,2 +0,0 @@
-@echo off
-powershell -ExecutionPolicy Bypass %*
--- a/pwsh/install.ps1
+++ b/pwsh/install.ps1
@@ -1,8 +0,0 @@
-#!/bin/pwsh
-
-Write-Output "'pwsh@$Env:WEBI_TAG' is an alias for 'powershell@$Env:WEBI_VERSION'"
-
-$PwshBootUrl = "$Env:WEBI_HOST/powershell@$Env:WEBI_VERSION"
-$PwshBootScript = "$HOME\.local\tmp\install-pwsh-boot.ps1"
-Invoke-DownloadUrl -Force -URL $PwshBootUrl -Path $PwshBootScript
-powershell -ExecutionPolicy Bypass $PwshBootScript
--- a/ripgrep/install.ps1
+++ b/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
--- a/ssh-authorize/README.md
+++ b/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`
--- a/ssh-authorize/install.ps1
+++ b/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"
--- a/ssh-authorize/ssh-authorize.ps1
+++ b/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 --fail-with-body -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
--- a/ssh-pubkey/install.ps1
+++ b/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"
--- a/tinygo/install.ps1
+++ b/tinygo/install.ps1
@@ -30,7 +30,12 @@ IF (!(Test-Path -Path "$pkg_download")) {
 Write-Output "Checking for Go compiler..."
 IF (-Not (Get-Command -Name "go" -ErrorAction Silent)) {
    & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" go
-    $null = Sync-EnvPath
+    $Env:Path = "$HOME\.local\opt\go\bin;$Env:Path"
+    $Env:Path = "$HOME\go\bin;$Env:Path"
+    [System.Environment]::SetEnvironmentVariable(
+        "Path",
+        $env:Path,
+        [System.EnvironmentVariableTarget]::User)
 }

 IF (!(Test-Path -Path "$pkg_src")) {
--- a/trippy/install.ps1
+++ b/trippy/install.ps1
@@ -2,4 +2,4 @@

 Write-Output "'trippy@$Env:WEBI_TAG' is an alias for 'trip@$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/trip@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/trip@$Env:WEBI_VERSION" | powershell
--- a/vim-commentary/install.ps1
+++ b/vim-commentary/install.ps1
@@ -39,7 +39,11 @@ function fn_git_shallow_clone {
    Write-Output "Checking for Git..."
    IF (-Not (Get-Command -Name "git" -ErrorAction Silent)) {
        & "$HOME\.local\bin\webi-pwsh.ps1" git
-        $null = Sync-EnvPath
+        $Env:Path = "$HOME\.local\opt\git\cmd;$Env:Path"
+        [System.Environment]::SetEnvironmentVariable(
+            "Path",
+            $env:Path,
+            [System.EnvironmentVariableTarget]::User)
    }

    Write-Output "Cloning $Env:PKG_NAME from $Env:WEBI_PKG_URL to $pkg_src"
@@ -54,7 +58,7 @@ function fn_git_shallow_clone {
 }

 function fn_remove_existing {
-    Remove-Item -Recurse -Force -ErrorAction Ignore `
+    Remove-Item -Recurse -Force `
        -Path "$pkg_dst" | Out-Null
 }

--- a/vim-things.sh
+++ b/vim-things.sh
@@ -1,12 +0,0 @@
-vim README.md
-vim _webi/template.ps1
-vim _webi/template.sh
-vim brew/install.sh
-vim git/install.ps1
-vim golang/install.ps1
-vim golang/install.sh
-vim node/install.ps1
-vim postgres/install.sh
-vim sass/install.ps1
-vim webi/install.sh
-vim zig/install.ps1
--- a/vim-zig/install.ps1
+++ b/vim-zig/install.ps1
@@ -39,7 +39,11 @@ function fn_git_shallow_clone {
    Write-Output "Checking for Git..."
    IF (-Not (Get-Command -Name "git" -ErrorAction Silent)) {
        & "$HOME\.local\bin\webi-pwsh.ps1" git
-        $null = Sync-EnvPath
+        $Env:Path = "$HOME\.local\opt\git\cmd;$Env:Path"
+        [System.Environment]::SetEnvironmentVariable(
+            "Path",
+            $env:Path,
+            [System.EnvironmentVariableTarget]::User)
    }

    Write-Output "Cloning $Env:PKG_NAME from $Env:WEBI_PKG_URL to $pkg_src"
@@ -54,7 +58,7 @@ function fn_git_shallow_clone {
 }

 function fn_remove_existing {
-    Remove-Item -Recurse -Force -ErrorAction Ignore `
+    Remove-Item -Recurse -Force `
        -Path "$pkg_dst" | Out-Null
 }

--- a/webi/webi-pwsh.ps1
+++ b/webi/webi-pwsh.ps1
@@ -1,224 +0,0 @@
-#!/usr/bin/env pwsh
-
-Set-ExecutionPolicy -Scope Process Bypass
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue'
-
-$my_version = 'v1.2.0'
-
-IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") {
-    $Env:WEBI_HOST = "https://webinstall.dev"
-}
-
-$exename = $args[0]
-
-# 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"
-
-$OriginalPath = $Env:Path
-$IsWebiParent = -Not (Test-Path Env:IsWebiChild)
-$Env:IsWebiChild = $true
-
-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) {
-    IF ($IsWebiParent) {
-        Write-Host ""
-        Write-Host "Running Webi with elevated privileges is unsupported." -ForegroundColor Magenta -BackgroundColor black
-        Write-Host "Please run Webi as a normal user, NOT as administrator." -ForegroundColor Magenta -BackgroundColor black
-        Write-Host ""
-    }
-}
-
-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 '-#' --fail-with-body -sS -A $Env:WEBI_UA $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 Show-HowToUpdateEnv {
-    $UpdateUserPath = "`$UserPath = [Environment]::GetEnvironmentVariable('Path', 'User')"
-    $UpdateMachinePath = "`$MachinePath = [Environment]::GetEnvironmentVariable('Path', 'Machine')"
-
-    Write-Host ''
-    Write-Host '***********************************' -ForegroundColor yellow -BackgroundColor black
-    Write-Host '*      IMPORTANT -- READ ME       *' -ForegroundColor yellow -BackgroundColor black
-    Write-Host '*  (run the PATH commands below)  *' -ForegroundColor yellow -BackgroundColor black
-    Write-Host '***********************************' -ForegroundColor yellow -BackgroundColor black
-    Write-Host ''
-    Write-Host ""
-    Write-Host "Copy, paste, and run the appropriate commands to update your PATH:"
-    Write-Host ""
-    Write-Host "cmd.exe:"
-    Write-Host "    (close and reopen the terminal)" -ForegroundColor yellow -BackgroundColor black
-    Write-Host ""
-    Write-Host "PowerShell:"
-    Write-Host "    $UpdateUserPath" -ForegroundColor yellow -BackgroundColor black
-    Write-Host "    $UpdateMachinePath" -ForegroundColor yellow -BackgroundColor black
-    Write-Host "    `$Env:Path = `"`${UserPath};`${MachinePath}`"" -ForegroundColor yellow -BackgroundColor black
-    Write-Host "    (or close and reopen the terminal)"
-    Write-Host ""
-}
-
-function Install-Webi {
-    # Make paths if needed
-    # TODO replace all bin with opt\bin\
-    $null = New-Item -Path "$HOME\.local\bin\" -ItemType Directory -Force
-    $null = New-Item -Path "$HOME\.local\opt\" -ItemType Directory -Force
-
-    # See note on Set-ExecutionPolicy above
-    Set-Content -Path "$HOME\.local\bin\webi.bat" -Value "@echo off`r`npowershell -ExecutionPolicy Bypass %USERPROFILE%\.local\bin\webi-pwsh.ps1 %*"
-
-    # Backwards-compat bugfix: remove old webi-pwsh.ps1 location
-    Remove-Item -Path "$HOME\.local\bin\webi.ps1" -Recurse -ErrorAction Ignore
-
-    # TODO windows version of mktemp -d
-    IF (Test-Path -Path "$HOME\.local\tmp") {
-        Write-Host "    Found $HOME\.local\tmp\"
-    } ELSE {
-        Write-Host "    Creating $HOME\.local\tmp\"
-        $null = New-Item -Path "$HOME\.local\tmp" -ItemType Directory -Force | Out-Null
-    }
-}
-
-## 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
-}
-
-# Switch to userprofile
-Push-Location $Env:USERPROFILE
-
-$Env:WEBI_UA = Get-UserAgent
-
-IF ($IsWebiParent) {
-    Write-Host ""
-    Write-Host "${TName}Welcome to${TReset} ${TTask}Webi${TReset}${TName}!${TReset} - Instant Installs, Easy to Remember URLs"
-    Write-Host "${TDim}($Env:WEBI_UA)${TReset}"
-    Write-Host ""
-}
-
-Write-Host ""
-Write-Host "${TTask}Installing${TReset} ${TName}${exename}${TReset}"
-Write-Host "    ${TDim}Fetching install script ...${TReset}"
-
-$PKG_URL = "$Env:WEBI_HOST/api/installers/$exename.ps1"
-# TODO detect formats
-$UrlParams = "formats=zip,exe,tar,git&libc=msvc"
-$PkgInstallPwsh = "$HOME\.local\tmp\$exename.install.ps1"
-Invoke-DownloadUrl -Force -URL $PKG_URL -Params $UrlParams -Path $PkgInstallPwsh
-
-powershell $HOME\.local\tmp\${exename}.install.ps1
-
-IF ($IsWebiParent) {
-    Write-Host ""
-    Write-Host "Checking for updates to Webi ..."
-    $WebiUrl = "${Env:WEBI_HOST}/packages/webi/webi-pwsh.ps1"
-    $WebiPath = "$HOME\.local\bin\webi-pwsh.ps1"
-    Invoke-DownloadUrl -Force -URL $WebiUrl -Path $WebiPath
-
-    $UserPath = [Environment]::GetEnvironmentVariable("Path", "User").Trim(';')
-    $MachinePath = [Environment]::GetEnvironmentVariable("Path", "Machine").Trim(';')
-    $Env:Path = "${UserPath};${MachinePath}"
-    IF ($OriginalPath -ne $Env:Path) {
-        Show-HowToUpdateEnv
-    }
-}
-
-Pop-Location
--- a/webi/webi.sh
+++ b/webi/webi.sh
--- a/xcaddy/install.ps1
+++ b/xcaddy/install.ps1
@@ -23,7 +23,12 @@ $pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 Write-Output "Checking for Go compiler..."
 IF (-Not (Get-Command -Name "go" -ErrorAction Silent)) {
    & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" go
-    $null = Sync-EnvPath
+    $Env:Path = "$HOME\.local\opt\go\bin;$Env:Path"
+    $Env:Path = "$HOME\go\bin;$Env:Path"
+    [System.Environment]::SetEnvironmentVariable(
+        "Path",
+        $env:Path,
+        [System.EnvironmentVariableTarget]::User)
 }

 # Fetch archive
--- a/zig.vim/install.ps1
+++ b/zig.vim/install.ps1
@@ -2,4 +2,4 @@

 Write-Output "'zig.vim@$Env:WEBI_TAG' is an alias for 'vim-zig@$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/vim-zig@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/vim-zig@$Env:WEBI_VERSION" | powershell
--- a/ziglang/install.ps1
+++ b/ziglang/install.ps1
@@ -2,4 +2,4 @@

 Write-Output "'ziglang@$Env:WEBI_TAG' is an alias for 'zig@$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/zig@$Env:WEBI_VERSION" | powershell
+curl.exe -fsSL "$Env:WEBI_HOST/zig@$Env:WEBI_VERSION" | powershell
--- a/zoxide/install.ps1
+++ b/zoxide/install.ps1
@@ -21,7 +21,7 @@ $pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 # Fetch archive
 IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
    Write-Output "Downloading zoxide from $Env:WEBI_PKG_URL to $pkg_download"
-    & curl.exe -A MS -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
+    & curl.exe -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
    & Move-Item "$pkg_download.part" "$pkg_download"
 }
Author	SHA1	Message	Date
AJ ONeal	1f6e574030	WIP feroxbuster	2023-11-07 09:43:36 -07:00
AJ ONeal	6626a0df86	WIP: psscriptanalyzer	2023-11-07 09:43:36 -07:00
AJ ONeal	b61a678371	doc(pwsh): update modules dirs, add ToC	2023-11-07 09:43:36 -07:00
Don Johnson	eba10b52e6	feat: add feroxbuster (forced browsing security tool)	2023-11-07 09:43:35 -07:00