refactor(posix): remove function prefixes from all shell files

2026-08-18 19:46:59 +00:00 · 2022-08-18 15:10:58 +00:00
parent 82af8b46a4
commit fdeefd7e75
132 changed files with 169 additions and 169 deletions
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2034
 # "'pkg_cmd_name' appears unused. Verify it or export it."

-function __init_foobar() {
+__init_foobar() {
    set -e
    set -u

@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_vim_example() {
+__init_vim_example() {
    set -e
    set -u

@@ -2,7 +2,7 @@

 #set -x

-function __install_webi() {
+__install_webi() {

    #WEBI_PKG=
    #WEBI_HOST=https://webinstall.dev
@@ -32,7 +32,7 @@ set -e
 set -u
 #set -x

-function __webi_main () {
+__webi_main() {

    export WEBI_TIMESTAMP=\$(date +%F_%H-%M-%S)
    export _webi_tmp="\${_webi_tmp:-\$(mktemp -d -t webi-\$WEBI_TIMESTAMP.XXXXXXXX)}"
@@ -90,7 +90,7 @@ function __webi_main () {
    export WEBI_UA="\$(uname -a)"


-    function webinstall() {
+    webinstall() {

        my_package="\${1:-}"
        if [ -z "\$my_package" ]; then
@@ -144,14 +144,14 @@ function __webi_main () {

    }

-    function version() {
+    version() {
        my_version=v1.1.15
        printf "\\e[31mwebi\\e[32m %s\\e[0m Copyright 2020+ AJ ONeal\\n" "\${my_version}"
        printf "    \\e[34mhttps://webinstall.dev/webi\\e[0m\\n"
    }

    # show help if no params given or help flags are used
-    function usage() {
+    usage() {
        echo ""
        version
        echo ""
@@ -1,6 +1,6 @@
 #!/bin/bash
 # For installing from the extracted package tmp directory
-function pkg_install() {
+pkg_install() {
    pushd "$WEBI_TMP" 2>&1 > /dev/null

    if [ -n "$(command -v rsync 2> /dev/null | grep rsync)" ]; then
@@ -4,7 +4,7 @@
 # because I prefer to use sed rather than bash replace
 # (there's too little space in my head to learn both syntaxes)

-function __bootstrap_webi() {
+__bootstrap_webi() {

    set -e
    set -u
@@ -328,7 +328,7 @@ function __bootstrap_webi() {
        echo ""
    fi

-    function __init_installer() {
+    __init_installer() {

        # do nothing - to satisfy parser prior to templating
        echo -n ""
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_arc() {
+__init_arc() {

    ####################
    # Install archiver #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_arc() {
+__redirect_alias_arc() {
    echo "'archiver@${WEBI_TAG:-stable}' is an alias for 'arc@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/arc@${WEBI_VERSION:-}" | bash
@@ -14,7 +14,7 @@ pkg_cmd_name="awless"
 # IMPORTANT: this let's other functions know to expect this to be a single file
 WEBI_SINGLE=true

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'awless version' has output in this format:
    #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
    # This trims it down to just the version number:
@@ -22,7 +22,7 @@ function pkg_get_current_version() {
    awless version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::'
 }

-function pkg_install() {
+pkg_install() {
    # $HOME/.local/opt/awless-v2.1.0/bin
    mkdir -p "$pkg_src_bin"

@@ -33,7 +33,7 @@ function pkg_install() {
    chmod a+x "$pkg_src_cmd"
 }

-function pkg_link() {
+pkg_link() {
    # rm -f "$HOME/.local/bin/awless"
    rm -f "$pkg_dst_cmd"

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_bat() {
+__init_bat() {

    ###############
    # Install bat #
@@ -3,7 +3,7 @@
 set -e
 set -u

-function _install_brew() {
+_install_brew() {
    # Straight from https://brew.sh
    #/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"

@@ -14,7 +14,7 @@ pkg_cmd_name="caddy"
 # IMPORTANT: this let's other functions know to expect this to be a single file
 WEBI_SINGLE=true

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'caddy version' has output in this format:
    #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
    # This trims it down to just the version number:
@@ -22,7 +22,7 @@ function pkg_get_current_version() {
    caddy version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::'
 }

-function pkg_install() {
+pkg_install() {
    # $HOME/.local/opt/caddy-v2.1.0/bin
    mkdir -p "$pkg_src_bin"

@@ -33,7 +33,7 @@ function pkg_install() {
    chmod a+x "$pkg_src_cmd"
 }

-function pkg_link() {
+pkg_link() {
    # rm -f "$HOME/.local/bin/caddy"
    rm -f "$pkg_dst_cmd"

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_chromedriver() {
+__init_chromedriver() {

    ########################
    # Install chromedriver #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_comrak() {
+__init_comrak() {

    ##################
    # Install comrak #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_curlie() {
+__init_curlie() {

    ##################
    # Install curlie #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_dashmsg() {
+__init_dashmsg() {
    set -e
    set -u

@@ -5,7 +5,7 @@ set -u
 # shellcheck disable=SC2034
 # "'pkg_cmd_name' appears unused. Verify it or export it."

-function __init_delta() {
+__init_delta() {

    #################
    # Install delta #
@@ -12,7 +12,7 @@ pkg_cmd_name="deno"
 # IMPORTANT: this let's other functions know to expect this to be a single file
 WEBI_SINGLE=true

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'deno --version' has output in this format:
    #       deno 1.1.0
    #       v8 8.4.300
@@ -22,7 +22,7 @@ function pkg_get_current_version() {
    deno --version 2> /dev/null | head -n 1 | cut -d' ' -f2
 }

-function pkg_install() {
+pkg_install() {
    # $HOME/.local/xbin
    mkdir -p "$pkg_src_bin"

@@ -33,7 +33,7 @@ function pkg_install() {
    chmod a+x "$pkg_src_cmd"
 }

-function pkg_link() {
+pkg_link() {
    # rm -f "$HOME/.local/bin/deno"
    rm -f "$pkg_dst_cmd"

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_dotenv_linter() {
+__init_dotenv_linter() {

    #########################
    # Install dotenv-linter #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_dotenv() {
+__init_dotenv() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_fd() {
+__init_fd() {

    ###############
    # Install fd #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_ffmpeg() {
+__init_ffmpeg() {

    ##################
    # Install ffmpeg #
@@ -28,7 +28,7 @@ pkg_src="$pkg_src_cmd"

 # pkg_install must be defined by every package

-function _macos_post_install() {
+_macos_post_install() {
    if ! [ -e "$HOME/.local/bin/fish" ]; then
        return 0
    fi
@@ -66,12 +66,12 @@ function _macos_post_install() {
 # always try to reset the default shells
 _macos_post_install

-function pkg_install() {
+pkg_install() {
    mv fish.app/Contents/Resources/base/usr/local "$HOME/.local/opt/fish-v${WEBI_VERSION}"

 }

-function pkg_post_install() {
+pkg_post_install() {
    # don't skip what webi would do automatically
    webi_post_install

@@ -80,7 +80,7 @@ function pkg_post_install() {
 }

 # pkg_get_current_version is recommended, but (soon) not required
-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'fish --version' has output in this format:
    #       fish, version 3.1.2
    # This trims it down to just the version number:
@@ -21,7 +21,7 @@ pkg_src_cmd="$HOME/.local/opt/flutter-v$WEBI_VERSION/bin/flutter"
 pkg_src_dir="$HOME/.local/opt/flutter-v$WEBI_VERSION"
 pkg_src="$pkg_src_dir"

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'flutter --version' outputs a lot of information:
    #       Flutter 1.19.0-4.1.pre • channel beta • https://github.com/flutter/flutter.git
    #       Framework • revision f994b76974 (4 days ago) • 2020-06-09 15:53:13 -0700
@@ -32,7 +32,7 @@ function pkg_get_current_version() {
    flutter --version 2> /dev/null | head -n 1 | cut -d' ' -f2
 }

-function pkg_format_cmd_version() {
+pkg_format_cmd_version() {
    # 'flutter 1.19.0' is the canonical version format for flutter
    my_version="$1"
    echo "$pkg_cmd_name $my_version"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_fzf() {
+__init_fzf() {

    ###############
    # Install fzf #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_gh() {
+__init_gh() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __git_gpg_init() {
+__git_gpg_init() {
    export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
    export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH"

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_git_gpg_init() {
+__install_git_gpg_init() {
    MY_CMD="git-config-gpg"

    rm -f "$HOME/.local/bin/$MY_CMD"
@@ -10,7 +10,7 @@ function __install_git_gpg_init() {
    chmod a+x "$HOME/.local/bin/$MY_CMD"
 }

-function __check_gpg_pubkey_exists() {
+__check_gpg_pubkey_exists() {
    if ! command -v gpg; then
        "$HOME/.local/bin/webi" gpg-pubkey
        export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
@@ -18,7 +18,7 @@ function __check_gpg_pubkey_exists() {
    fi
 }

-function __check_gpg_exists() {
+__check_gpg_exists() {
    if ! command -v gpg; then
        "$HOME/.local/bin/webi" gpg
        export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_git_config_gpg() {
+__redirect_alias_git_config_gpg() {
    echo "'git-gpg-init' is a deprecated alias for 'git-config-gpg'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/git-config-gpg" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_git() {
+__init_git() {

    if [ -z "$(command -v git)" ]; then
        if [[ -n "$(uname -a | grep -i darwin)" ]]; then
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_gitdeploy() {
+__init_gitdeploy() {
    set -e
    set -u

@@ -6,7 +6,7 @@ pkg_cmd_name="gitea"
 pkg_src_cmd="$HOME/.local/opt/gitea-v$WEBI_VERSION/gitea"
 pkg_dst_cmd="$HOME/.local/opt/gitea/gitea"

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'gitea version' has output in this format:
    #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
    # This trims it down to just the version number:
@@ -14,7 +14,7 @@ function pkg_get_current_version() {
    gitea --version 2> /dev/null | head -n 1 | cut -d' ' -f3
 }

-function pkg_link() {
+pkg_link() {
    # although gitea is a single command it must be put in its own directory
    # because it will always resolve its working path to its location,
    # regardless of where it was started, where its config file lives, etc.
@@ -25,7 +25,7 @@ function pkg_link() {
 }

 # For installing from the extracted package tmp directory
-function pkg_install() {
+pkg_install() {
    # remove the versioned folder, just in case it's there with junk
    rm -rf "$pkg_src_bin"
    mkdir -p "$pkg_src_bin"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_gpg() {
+__redirect_alias_gpg() {
    echo "'gnupg@${WEBI_TAG:-stable}' is an alias for 'gpg@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/gpg@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_golang() {
+__redirect_alias_golang() {
    echo "'go@${WEBI_TAG:-stable}' is an alias for 'golang@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/golang@${WEBI_VERSION:-}" | bash
@@ -28,7 +28,7 @@ if [ -z "${WEBI__GO_ESSENTIALS:-}" ]; then
    sleep 4
 fi

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'go version' has output in this format:
    #       go version go1.14.2 darwin/amd64
    # This trims it down to just the version number:
@@ -39,13 +39,13 @@ function pkg_get_current_version() {
        sed 's:go::'
 }

-function pkg_format_cmd_version() {
+pkg_format_cmd_version() {
    # 'go v1.14.0' will be 'go1.14'
    my_version=$(echo "$1" | sed 's:\.0::g')
    echo "${pkg_cmd_name}${my_version}"
 }

-function pkg_link() {
+pkg_link() {
    # 'pkg_dst' will default to $HOME/.local/opt/go
    # 'pkg_src' will be the installed version, such as to $HOME/.local/opt/go-v1.14.2
    rm -rf "$pkg_dst"
@@ -60,7 +60,7 @@ function pkg_link() {
    ln -s "$GOBIN_REAL" "$GOBIN"
 }

-function pkg_post_install() {
+pkg_post_install() {
    pkg_link

    # web_path_add is defined in _webi/template.sh at https://github.com/webinstall/packages
@@ -77,7 +77,7 @@ function pkg_post_install() {
    fi
 }

-function pkg_done_message() {
+pkg_done_message() {
    echo "Installed 'go v$WEBI_VERSION' to ~/.local/opt/go"
    # note: literal $HOME on purpose
    #shellcheck disable=SC2016
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_goreleaser() {
+__init_goreleaser() {

    ######################
    # Install goreleaser #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {
    gpg --list-secret-keys --keyid-format LONG |
        grep sec |
        cut -d'/' -f2 |
@@ -2,19 +2,19 @@
 set -e
 set -u

-function __get_git_email() {
+__get_git_email() {
    git config --global user.email
    # grep 'email\s*=.*@' ~/.gitconfig | tr -d '\t ' | head -n 1 | cut -d'=' -f2
 }

-function __get_pubkey_id() {
+__get_pubkey_id() {
    gpg --list-secret-keys --keyid-format LONG |
        grep sec |
        cut -d'/' -f2 |
        cut -d' ' -f1
 }

-function _create_gpg_key() {
+_create_gpg_key() {
    if [[ ! -e ~/.gitconfig ]]; then
        return 1
    fi
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_gpg_pubkey() {
+__install_gpg_pubkey() {
    MY_CMD="gpg-pubkey"

    rm -f "$HOME/.local/bin/$MY_CMD"
@@ -10,7 +10,7 @@ function __install_gpg_pubkey() {
    chmod a+x "$HOME/.local/bin/$MY_CMD"
 }

-function __install_gpg_pubkey_id() {
+__install_gpg_pubkey_id() {
    MY_CMD="gpg-pubkey"
    MY_SUBCMD="gpg-pubkey-id"

@@ -19,7 +19,7 @@ function __install_gpg_pubkey_id() {
    chmod a+x "$HOME/.local/bin/$MY_SUBCMD"
 }

-function __check_gpg_exists() {
+__check_gpg_exists() {
    if ! command -v gpg; then
        "$HOME/.local/bin/webi" gpg
        export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
@@ -3,7 +3,7 @@
 set -e
 set -u

-function _install_gpg() {
+_install_gpg() {
    if ! (uname -a | grep -i "darwin" > /dev/null); then
        echo "No gpg installer for Linux yet. Try this instead:"
        echo "    sudo apt install -y gpg gnupg"
@@ -90,7 +90,7 @@ function _install_gpg() {
    fi
 }

-function _create_gpg_key() {
+_create_gpg_key() {
    if [[ ! -e ~/.gitconfig ]]; then
        return 0
    fi
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_gprox() {
+__init_gprox() {

    ##################
    # Install gprox #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_hexyl() {
+__init_hexyl() {

    ###############
    # Install hexyl #
@@ -5,7 +5,7 @@ set -u
 pkg_cmd_name="hugo"
 WEBI_SINGLE=true

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'hugo version' has output in this format:
    #       Hugo Static Site Generator v0.72.0-8A7EF3CF darwin/amd64 BuildDate: 2020-05-31T12:07:44Z
    # This trims it down to just the version number:
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_iterm2_themes() {
+__redirect_alias_iterm2_themes() {
    echo "'iterm-color-schemes@${WEBI_TAG:-stable}' is an alias for 'iterm2-themes@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/iterm2-themes@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_iterm2_themes() {
+__redirect_alias_iterm2_themes() {
    echo "'iterm-themes@${WEBI_TAG:-stable}' is an alias for 'iterm2-themes@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/iterm2-themes@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_iterm2_utils() {
+__redirect_alias_iterm2_utils() {
    echo "'iterm-utils@${WEBI_TAG:-stable}' is an alias for 'iterm2-utils@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/iterm2-utils@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_iterm2_themes() {
+__redirect_alias_iterm2_themes() {
    echo "'iterm2-color-schemes@${WEBI_TAG:-stable}' is an alias for 'iterm2-themes@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/iterm2-themes@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -u
 set -e

-function __install_iterm2_color_schemes() {
+__install_iterm2_color_schemes() {
    WEBI_HOST=${WEBI_HOST:-https://webinstall.dev}

    echo ''
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __iterm2_utils() {
+__iterm2_utils() {
    curl -fsSL https://iterm2.com/shell_integration/install_shell_integration_and_utilities.sh | bash
 }

@@ -3,7 +3,7 @@
 set -e
 set -u

-function _install_iterm2() {
+_install_iterm2() {
    # only for macOS
    if [[ "Darwin" != "$(uname -s)" ]]; then
        echo ""
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_jq() {
+__init_jq() {

    ##############
    # Install jq #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_jshint() {
+__init_jshint() {
    OLD_PATH="${PATH}"
    PATH="${HOME}/.local/opt/node/bin:${PATH}"
    if [ -z "$(npm --version 2> /dev/null)" ]; then
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_k9s() {
+__init_k9s() {

    ##################
    # Install k9s #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_keypairs() {
+__init_keypairs() {
    set -e
    set -u

@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_kind() {
+__init_kind() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_kubectx() {
+__init_kubectx() {

    ###################
    # Install kubectx #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_kubens() {
+__init_kubens() {

    ###################
    # Install kubens #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_lf() {
+__init_lf() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_lsd() {
+__init_lsd() {

    ###############
    # Install lsd #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {
    webi_download

    pushd ~/Downloads/webi 2>&1 > /dev/null
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_mutagen() {
+__init_mutagen() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_myip() {
+__init_myip() {

    rm -f "$HOME/.local/bin/myip"
    webi_download "$WEBI_HOST/packages/myip/myip.sh" "$HOME/.local/bin/myip"
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __show_my_ip() {
+__show_my_ip() {
    set -u
    set -e

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_nerdfont() {
+__redirect_alias_nerdfont() {
    echo "'nerd-font' is an alias for 'nerdfont'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/nerdfont@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __todo_nerdfonts() {
+__todo_nerdfonts() {
    echo "The full Nerd Fonts patcher is not yet available."
    echo "Want the Droid Sans 'nerdfont' in the meantime?"
    echo ""
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_nerdfont() {
+__init_nerdfont() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __todo_nerdfonts() {
+__todo_nerdfonts() {
    echo "The full Nerd Fonts patcher is not yet available."
    echo "Want the Droid Sans 'nerdfont' in the meantime?"
    echo ""
@@ -12,7 +12,7 @@ set -u
 pkg_cmd_name="node"
 #WEBI_SINGLE=""

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'node --version' has output in this format:
    #       v12.8.0
    # This trims it down to just the version number:
@@ -23,7 +23,7 @@ function pkg_get_current_version() {
        sed 's:^v::'
 }

-function pkg_install() {
+pkg_install() {
    # mkdir -p $HOME/.local/opt
    mkdir -p "$(dirname $pkg_src)"

@@ -31,7 +31,7 @@ function pkg_install() {
    mv ./"$pkg_cmd_name"* "$pkg_src"
 }

-function pkg_link() {
+pkg_link() {
    # rm -f "$HOME/.local/opt/node"
    rm -f "$pkg_dst"

@@ -42,6 +42,6 @@ function pkg_link() {
    "$pkg_src"/bin/node "$pkg_src"/bin/npm config set scripts-prepend-node-path=true
 }

-function pkg_done_message() {
+pkg_done_message() {
    echo "Installed 'node' and 'npm' at $pkg_dst"
 }
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2034
 # "'pkg_cmd_name' appears unused. Verify it or export it."

-function __init_ots() {
+__init_ots() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_pandoc() {
+__init_pandoc() {

    ###################
    # Install pandoc #
@@ -6,11 +6,11 @@ set -u
 pkg_cmd_name="pathman"
 WEBI_SINGLE=true

-function pkg_get_current_version() {
+pkg_get_current_version() {
    pathman version 2> /dev/null | head -n 1 | cut -d ' ' -f2 | sed 's:^v::'
 }

-function pkg_done_message() {
+pkg_done_message() {
    # no message
    true
 }
@@ -8,7 +8,7 @@ pkg_cmd_name="postgres"

 POSTGRES_DATA_DIR=$HOME/.local/share/postgres/var

-function pkg_get_current_version() {
+pkg_get_current_version() {
    # 'postgres --version' has output in this format:
    #       postgres (PostgreSQL) 10.13
    # This trims it down to just the version number:
@@ -16,7 +16,7 @@ function pkg_get_current_version() {
    postgres --version 2> /dev/null | head -n 1 | cut -d' ' -f3
 }

-function pkg_install() {
+pkg_install() {
    # mkdir -p $HOME/.local/opt
    mkdir -p "$(dirname $pkg_src)"

@@ -24,7 +24,7 @@ function pkg_install() {
    mv ./"p"* "$pkg_src"
 }

-function pkg_link() {
+pkg_link() {
    # rm -f "$HOME/.local/opt/postgres"
    rm -f "$pkg_dst"
    rm -f "$HOME/Applications/pgAdmin"*.app || true
@@ -35,7 +35,7 @@ function pkg_link() {
    ln -s "$pkg_src/pgAdmin 4.app" "$HOME/Applications/pgAdmin 4.app" || true
 }

-function pkg_post_install() {
+pkg_post_install() {
    webi_path_add "$pkg_dst_bin"

    #echo "Initializing PostgreSQL with database at $POSTGRES_DATA_DIR/"
@@ -53,7 +53,7 @@ function pkg_post_install() {
    fi
 }

-function pkg_done_message() {
+pkg_done_message() {
    # TODO show with serviceman
    echo "Installed 'postgres' and 'psql' at $pkg_dst"
    echo ""
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_postgres() {
+__redirect_alias_postgres() {
    echo "'postgresql' is an alias for 'postgres'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/postgres@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_powershell() {
+__init_powershell() {

    pkg_cmd_name="pwsh"
    # no ./bin prefix
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_prettier() {
+__init_prettier() {
    if [ -z "$(npm --version 2> /dev/null)" ]; then
        "$HOME/.local/bin/webi" node
        export PATH="$HOME/.local/opt/node/bin:$PATH"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_powershell() {
+__redirect_alias_powershell() {
    echo "'pwsh@${WEBI_TAG:-stable}' is an alias for 'powershell@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/powershell@${WEBI_VERSION:-}" | bash
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_pyenv() {
+__init_pyenv() {
    set -e
    set -u

@@ -3,7 +3,7 @@
 set -e
 set -u

-function __init_python() {
+__init_python() {
    if [[ ! -x "${HOME}/.pyenv/bin/pyenv" ]]; then
        "${HOME}/.local/bin/webi" "pyenv"
    fi
@@ -3,7 +3,7 @@
 set -e
 set -u

-function __init_python2() {
+__init_python2() {
    if [[ ! -x "${HOME}/.pyenv/bin/pyenv" ]]; then
        "${HOME}/.local/bin/webi" "pyenv"
    fi
@@ -3,7 +3,7 @@
 set -e
 set -u

-function __redirect_alias_python() {
+__redirect_alias_python() {
    echo "'python@${WEBI_TAG:-stable}' is an alias for 'python@${WEBI_VERSION:-}'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/python@${WEBI_VERSION:-}" | bash
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_rclone() {
+__init_rclone() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_rg() {
+__init_rg() {

    ###################
    # Install ripgrep #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_rg() {
+__redirect_alias_rg() {
    echo "'ripgrep@${WEBI_TAG:-}' (project) is an alias for 'rg@${WEBI_VERSION:-}' (command)"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/rg@${WEBI_VERSION:-}" | bash
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __redirect_alias_rustlang() {
+__redirect_alias_rustlang() {
    echo "'rust' is an alias for 'rustlang'"
    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
    curl -fsSL "$WEBI_HOST/rustlang@${WEBI_VERSION:-}" | bash
@@ -4,7 +4,7 @@ set -u

 # shellcheck disable=SC2016

-function __install_rust() {
+__install_rust() {

    # Straight from https://rustup.rs/
    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_sass() {
+__init_sass() {
    set -e
    set -u

@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_sclient() {
+__init_sclient() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_sd() {
+__init_sd() {

    ##################
    # Install sd #
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_serviceman() {
+__init_serviceman() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_setcap_netbind() {
+__install_setcap_netbind() {
    # remove prior version, if exists
    rm -f ~/.local/bin/setcap-netbind

@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {
    my_bin="${1}"
    # ex: node
    if [ -z "$(command -v "${my_bin}")" ]; then
@@ -1,6 +1,6 @@
 #!/bin/bash

-function __init_shellcheck() {
+__init_shellcheck() {
    set -e
    set -u

@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_shfmt() {
+__init_shfmt() {

    ##################
    # Install shfmt #
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_ssh_adduser() {
+__install_ssh_adduser() {
    my_cmd="ssh-adduser"

    rm -f "$HOME/.local/bin/${my_cmd}"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {

    # Add User 'app'
    # Picking 'app' by common convention (what Docker & Vagrant use).
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_ssh_pubkey() {
+__install_ssh_pubkey() {
    my_cmd="ssh-pubkey"

    rm -f "$HOME/.local/bin/${my_cmd}"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {

    if [ ! -d "$HOME/.ssh" ]; then
        mkdir -p "$HOME/.ssh/"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_ssh_setpass() {
+__install_ssh_setpass() {
    my_cmd="ssh-setpass"

    rm -f "$HOME/.local/bin/${my_cmd}"
@@ -2,7 +2,7 @@
 set -e
 set -u

-function main() {
+main() {
    my_key="${1:-"${HOME}/.ssh/id_rsa"}"
    ssh-keygen -p -f "${my_key}"
 }
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __install_ssh_utils() {
+__install_ssh_utils() {
    rm -f \
        "$HOME/.local/bin/ssh-pubkey" \
        "$HOME/.local/bin/ssh-setpass" \
@@ -2,7 +2,7 @@
 set -e
 set -u

-function __init_sudo() {
+__init_sudo() {

    if [ -z "$(command -v sudo)" ]; then
        echo >&2 "Error: on Linux and BSD you should install sudo via the native package manager"
--- a/Show More
+++ b/Show More