From ca7a838c6fde6052124947ff442aa9e6056f5e28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20Wo=C5=BAniak?= Date: Mon, 15 Nov 2021 21:33:22 +0100 Subject: [PATCH] chore(style): convert blocks into functions (see #325) --- _webi/example_install_safe_copy.sh | 3 +- arc/install.sh | 5 ++- archiver/install.sh | 1 + awless/install.sh | 6 ++-- bat/install.sh | 4 ++- caddy/install.sh | 6 ++-- chromedriver/install.sh | 4 ++- comrak/install.sh | 4 ++- curlie/install.sh | 4 ++- deno/install.sh | 6 ++-- dotenv-linter/install.sh | 4 ++- fd/install.sh | 4 ++- ffmpeg/install.sh | 4 ++- flutter/install.sh | 4 +-- fzf/install.sh | 4 ++- git-config-gpg/git-config-gpg.sh | 54 ++++++++++++++++-------------- gitea/install.sh | 7 ++-- gnupg/install.sh | 1 + go/install.sh | 1 + golang/install.sh | 10 +++--- goreleaser/install.sh | 4 ++- gprox/install.sh | 4 ++- hexyl/install.sh | 4 ++- hugo/install.sh | 3 +- iterm-utils/install.sh | 1 + iterm/install.sh | 1 + jq/install.sh | 4 ++- k9s/install.sh | 4 ++- kind/install.sh | 2 +- kubectx/install.sh | 4 ++- kubens/install.sh | 4 ++- lsd/install.sh | 4 ++- myip/install.sh | 4 ++- nerd-font/install.sh | 1 + nerd-fonts/install.sh | 1 + nerdfont/install.sh | 6 ++-- nerdfonts/install.sh | 1 + node/install.sh | 8 ++--- pandoc/install.sh | 5 ++- pathman/install.sh | 4 +-- postgres/install.sh | 12 ++++--- postgresql/install.sh | 1 + powershell/install.sh | 4 ++- prettier/install.sh | 14 +++++--- pwsh/install.sh | 1 + rg/install.sh | 4 +-- ripgrep/install.sh | 1 + rust/install.sh | 1 + sd/install.sh | 4 ++- shfmt/install.sh | 4 ++- ssh-utils/install.sh | 6 +++- ssh-utils/ssh-setpass.sh | 4 ++- sudo/install.sh | 6 +++- vim-beyondcode/install.sh | 47 ++++++++++++++------------ vim-essentials/install.sh | 48 ++++++++++++++------------ vps-addswap/install.sh | 4 ++- vps-utils/install.sh | 4 ++- watchexec/install.sh | 4 ++- xz/install.sh | 4 ++- yq/install.sh | 4 ++- zoxide/install.sh | 2 +- 61 files changed, 244 insertions(+), 140 deletions(-) diff --git a/_webi/example_install_safe_copy.sh b/_webi/example_install_safe_copy.sh index e1600bb..32ac3e0 100644 --- a/_webi/example_install_safe_copy.sh +++ b/_webi/example_install_safe_copy.sh @@ -1,5 +1,6 @@ +#!/bin/bash # For installing from the extracted package tmp directory -pkg_install() { +function pkg_install() { pushd "$WEBI_TMP" 2>&1 > /dev/null if [ -n "$(command -v rsync 2> /dev/null | grep rsync)" ]; then diff --git a/arc/install.sh b/arc/install.sh index 4d983ee..184c05c 100644 --- a/arc/install.sh +++ b/arc/install.sh @@ -1,4 +1,5 @@ -{ +#!/bin/bash +function __init_arc() { set -e set -u @@ -34,3 +35,5 @@ echo "$(arc version 2> /dev/null | head -n 1 | cut -d' ' -f2 | sed 's:^v::')" } } + +__init_arc diff --git a/archiver/install.sh b/archiver/install.sh index e5a5e72..a817bf1 100644 --- a/archiver/install.sh +++ b/archiver/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: Archiver (arc alias) # homepage: https://webinstall.dev/arc # tagline: Alias for https://webinstall.dev/arc diff --git a/awless/install.sh b/awless/install.sh index 089e2c4..db394c0 100644 --- a/awless/install.sh +++ b/awless/install.sh @@ -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 -pkg_get_current_version() { +function 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 @@ pkg_get_current_version() { echo "$(awless version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')" } -pkg_install() { +function pkg_install() { # $HOME/.local/opt/awless-v2.1.0/bin mkdir -p "$pkg_src_bin" @@ -33,7 +33,7 @@ pkg_install() { chmod a+x "$pkg_src_cmd" } -pkg_link() { +function pkg_link() { # rm -f "$HOME/.local/bin/awless" rm -f "$pkg_dst_cmd" diff --git a/bat/install.sh b/bat/install.sh index b6f812e..004dea2 100644 --- a/bat/install.sh +++ b/bat/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_bat() { set -e set -u @@ -29,3 +29,5 @@ chmod a+x "$pkg_src_cmd" } } + +__init_bat diff --git a/caddy/install.sh b/caddy/install.sh index c0980b9..f59c42a 100644 --- a/caddy/install.sh +++ b/caddy/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 -pkg_get_current_version() { +function 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 @@ pkg_get_current_version() { echo "$(caddy version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')" } -pkg_install() { +function pkg_install() { # $HOME/.local/opt/caddy-v2.1.0/bin mkdir -p "$pkg_src_bin" @@ -33,7 +33,7 @@ pkg_install() { chmod a+x "$pkg_src_cmd" } -pkg_link() { +function pkg_link() { # rm -f "$HOME/.local/bin/caddy" rm -f "$pkg_dst_cmd" diff --git a/chromedriver/install.sh b/chromedriver/install.sh index b7e4bbf..29c8ec9 100644 --- a/chromedriver/install.sh +++ b/chromedriver/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_chromedriver() { set -e set -u @@ -37,3 +37,5 @@ } } + +__init_chromedriver diff --git a/comrak/install.sh b/comrak/install.sh index a51a902..4e2bfb6 100644 --- a/comrak/install.sh +++ b/comrak/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_comrak() { set -e set -u @@ -34,3 +34,5 @@ "$pkg_src_cmd" --version > /dev/null } } + +__init_comrak diff --git a/curlie/install.sh b/curlie/install.sh index f22adbd..b5ccebf 100644 --- a/curlie/install.sh +++ b/curlie/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_curlie() { set -e set -u @@ -31,3 +31,5 @@ chmod a+x "$pkg_src_cmd" } } + +__init_curlie diff --git a/deno/install.sh b/deno/install.sh index 78fc3d5..ff70f45 100644 --- a/deno/install.sh +++ b/deno/install.sh @@ -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 -pkg_get_current_version() { +function pkg_get_current_version() { # 'deno --version' has output in this format: # deno 1.1.0 # v8 8.4.300 @@ -22,7 +22,7 @@ pkg_get_current_version() { echo "$(deno --version 2> /dev/null | head -n 1 | cut -d' ' -f2)" } -pkg_install() { +function pkg_install() { # $HOME/.local/xbin mkdir -p "$pkg_src_bin" @@ -33,7 +33,7 @@ pkg_install() { chmod a+x "$pkg_src_cmd" } -pkg_link() { +function pkg_link() { # rm -f "$HOME/.local/bin/deno" rm -f "$pkg_dst_cmd" diff --git a/dotenv-linter/install.sh b/dotenv-linter/install.sh index 8a8c2ad..2cbf3a1 100644 --- a/dotenv-linter/install.sh +++ b/dotenv-linter/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __dotenv_linter() { set -e set -u @@ -37,3 +37,5 @@ } } + +__dotenv_linter diff --git a/fd/install.sh b/fd/install.sh index 50af476..58c7568 100644 --- a/fd/install.sh +++ b/fd/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_fd() { set -e set -u @@ -29,3 +29,5 @@ chmod a+x "$pkg_src_cmd" } } + +__init_fd diff --git a/ffmpeg/install.sh b/ffmpeg/install.sh index eaf4e30..9eddc54 100644 --- a/ffmpeg/install.sh +++ b/ffmpeg/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_ffmpeg() { set -e set -u @@ -39,3 +39,5 @@ } } + +__init_ffmpeg diff --git a/flutter/install.sh b/flutter/install.sh index 9626eb3..36ab4e1 100644 --- a/flutter/install.sh +++ b/flutter/install.sh @@ -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" -pkg_get_current_version() { +function 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 @@ pkg_get_current_version() { echo "$(flutter --version 2> /dev/null | head -n 1 | cut -d' ' -f2)" } -pkg_format_cmd_version() { +function pkg_format_cmd_version() { # 'flutter 1.19.0' is the canonical version format for flutter my_version="$1" echo "$pkg_cmd_name $my_version" diff --git a/fzf/install.sh b/fzf/install.sh index 6c2145e..7729455 100644 --- a/fzf/install.sh +++ b/fzf/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_fzf() { set -e set -u @@ -29,3 +29,5 @@ chmod a+x "$pkg_src_cmd" } } + +__init_fzf diff --git a/git-config-gpg/git-config-gpg.sh b/git-config-gpg/git-config-gpg.sh index 3b38745..324bd00 100644 --- a/git-config-gpg/git-config-gpg.sh +++ b/git-config-gpg/git-config-gpg.sh @@ -2,35 +2,39 @@ set -e set -u -export PATH="$HOME/.local/opt/gnupg/bin:$PATH" -export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH" +function __git_gpg_init() { + export PATH="$HOME/.local/opt/gnupg/bin:$PATH" + export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH" -# TODO check for public key without gpg-pubkey? -if ! command -v gpg-pubkey; then - webi gpg-pubkey -else - gpg-pubkey -fi + # TODO check for public key without gpg-pubkey? + if ! command -v gpg-pubkey; then + webi gpg-pubkey + else + gpg-pubkey + fi -MY_KEY_ID="$( - gpg-pubkey-id -)" + MY_KEY_ID="$( + gpg-pubkey-id + )" -echo -n "Enabling automatic git commit signing... - git config --global user.signingkey ${MY_KEY_ID} + echo -n "Enabling automatic git commit signing... + git config --global user.signingkey ${MY_KEY_ID} + git config --global commit.gpgsign true + git config --global log.showSignature true + " + + git config --global user.signingkey "${MY_KEY_ID}" git config --global commit.gpgsign true git config --global log.showSignature true -" -git config --global user.signingkey "${MY_KEY_ID}" -git config --global commit.gpgsign true -git config --global log.showSignature true + echo "" + echo "Successfully updated ~/.gitconfig" + echo "" + echo "How to verify signed commits on GitHub:" + echo "" + echo " 1. Go to 'Add GPG Key': https://github.com/settings/gpg/new" + echo " 2. Copy and paste the key above from the first ---- to the last ----" + echo "" +} -echo "" -echo "Successfully updated ~/.gitconfig" -echo "" -echo "How to verify signed commits on GitHub:" -echo "" -echo " 1. Go to 'Add GPG Key': https://github.com/settings/gpg/new" -echo " 2. Copy and paste the key above from the first ---- to the last ----" -echo "" +__git_gpg_init diff --git a/gitea/install.sh b/gitea/install.sh index bb55c66..5726292 100644 --- a/gitea/install.sh +++ b/gitea/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash set -e set -u @@ -5,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" -pkg_get_current_version() { +function 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: @@ -13,7 +14,7 @@ pkg_get_current_version() { echo "$(gitea --version 2> /dev/null | head -n 1 | cut -d' ' -f3)" } -pkg_link() { +function 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. @@ -24,7 +25,7 @@ pkg_link() { } # For installing from the extracted package tmp directory -pkg_install() { +function pkg_install() { # remove the versioned folder, just in case it's there with junk rm -rf "$pkg_src_bin" mkdir -p "$pkg_src_bin" diff --git a/gnupg/install.sh b/gnupg/install.sh index 8f4595b..1d731da 100644 --- a/gnupg/install.sh +++ b/gnupg/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: GnuPG (gpg alias) # homepage: https://webinstall.dev/gpg # tagline: Alias for https://webinstall.dev/gpg diff --git a/go/install.sh b/go/install.sh index 613fde2..c096eea 100644 --- a/go/install.sh +++ b/go/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: Go (golang alias) # homepage: https://webinstall.dev/golang # tagline: Alias for https://webinstall.dev/golang diff --git a/golang/install.sh b/golang/install.sh index 4530dfa..2df6a91 100644 --- a/golang/install.sh +++ b/golang/install.sh @@ -15,7 +15,7 @@ pkg_cmd_name="go" # # Their defaults are defined in _webi/template.sh at https://github.com/webinstall/packages -pkg_get_current_version() { +function 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: @@ -26,13 +26,13 @@ pkg_get_current_version() { sed 's:go::' } -pkg_format_cmd_version() { +function 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}" } -pkg_link() { +function 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" @@ -47,7 +47,7 @@ pkg_link() { ln -s "$GOBIN_REAL" "$GOBIN" } -pkg_post_install() { +function pkg_post_install() { pkg_link # web_path_add is defined in _webi/template.sh at https://github.com/webinstall/packages @@ -108,7 +108,7 @@ pkg_post_install() { echo "" } -pkg_done_message() { +function pkg_done_message() { echo "Installed 'go v$WEBI_VERSION' to ~/.local/opt/go" # note: literal $HOME on purpose #shellcheck disable=SC2016 diff --git a/goreleaser/install.sh b/goreleaser/install.sh index 92eb6c9..477035c 100644 --- a/goreleaser/install.sh +++ b/goreleaser/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_goreleaser() { set -e set -u @@ -37,3 +37,5 @@ } } + +__init_goreleaser diff --git a/gprox/install.sh b/gprox/install.sh index fdb7d42..1032165 100644 --- a/gprox/install.sh +++ b/gprox/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_gprox() { set -e set -u @@ -27,3 +27,5 @@ echo $(gprox --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2) } } + +__init_gprox diff --git a/hexyl/install.sh b/hexyl/install.sh index 218c0e3..74e2436 100644 --- a/hexyl/install.sh +++ b/hexyl/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_hexyl() { set -e set -u @@ -29,3 +29,5 @@ chmod a+x "$pkg_src_cmd" } } + +__init_hexyl diff --git a/hugo/install.sh b/hugo/install.sh index fce62f4..1ef6284 100644 --- a/hugo/install.sh +++ b/hugo/install.sh @@ -1,10 +1,11 @@ +#!/bin/bash set -e set -u pkg_cmd_name="hugo" WEBI_SINGLE=true -pkg_get_current_version() { +function 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: diff --git a/iterm-utils/install.sh b/iterm-utils/install.sh index 7ade9a5..b69437e 100644 --- a/iterm-utils/install.sh +++ b/iterm-utils/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: iterm-utils (iterm2-utils alias) # homepage: https://webinstall.dev/iterm2-utils # tagline: Alias for https://webinstall.dev/iterm2-utils diff --git a/iterm/install.sh b/iterm/install.sh index 1671609..cc5e930 100644 --- a/iterm/install.sh +++ b/iterm/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: iTerm (iTerm2 alias) # homepage: https://webinstall.dev/iterm2 # tagline: Alias for https://webinstall.dev/iterm2 diff --git a/jq/install.sh b/jq/install.sh index a15919d..205ea1b 100644 --- a/jq/install.sh +++ b/jq/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_jq() { set -e set -u @@ -18,3 +18,5 @@ echo $(jq --version 2> /dev/null | head -n 1 | sed 's:^jq-::') } } + +__init_jq diff --git a/k9s/install.sh b/k9s/install.sh index f027ea1..158316c 100644 --- a/k9s/install.sh +++ b/k9s/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_k9s() { set -e set -u @@ -41,3 +41,5 @@ } } + +__init_k9s diff --git a/kind/install.sh b/kind/install.sh index 61a3181..b3e1ed7 100644 --- a/kind/install.sh +++ b/kind/install.sh @@ -23,7 +23,7 @@ function __init_kind() { } pkg_get_current_version() { - echo $(kind --version 2>/dev/null | head -n 1 | cut -d ' ' -f 2) + echo $(kind --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2) } } diff --git a/kubectx/install.sh b/kubectx/install.sh index 17b34b8..035a781 100644 --- a/kubectx/install.sh +++ b/kubectx/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_kubectx() { set -e set -u @@ -34,3 +34,5 @@ } } + +__init_kubectx diff --git a/kubens/install.sh b/kubens/install.sh index b4cdb15..aff1465 100644 --- a/kubens/install.sh +++ b/kubens/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_kubens() { set -e set -u @@ -34,3 +34,5 @@ } } + +__init_kubens diff --git a/lsd/install.sh b/lsd/install.sh index 67d5876..ee91a4e 100644 --- a/lsd/install.sh +++ b/lsd/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_lsd() { set -e set -u @@ -37,3 +37,5 @@ } } + +__init_lsd diff --git a/myip/install.sh b/myip/install.sh index 0d261e5..2f908b5 100644 --- a/myip/install.sh +++ b/myip/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_myip() { set -e set -u @@ -10,3 +10,5 @@ "$HOME/.local/bin/myip" } + +__init_myip diff --git a/nerd-font/install.sh b/nerd-font/install.sh index e2af447..b403cda 100644 --- a/nerd-font/install.sh +++ b/nerd-font/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: nerd-font (nerdfont alias) # homepage: https://webinstall.dev/nerdfont # tagline: Alias for https://webinstall.dev/nerdfont diff --git a/nerd-fonts/install.sh b/nerd-fonts/install.sh index bc37cfb..fe4f221 100644 --- a/nerd-fonts/install.sh +++ b/nerd-fonts/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: nerd-fonts (nerdfont alias) # homepage: https://webinstall.dev/nerdfont # tagline: Alias for https://webinstall.dev/nerdfont diff --git a/nerdfont/install.sh b/nerdfont/install.sh index 179d5c0..5a43965 100644 --- a/nerdfont/install.sh +++ b/nerdfont/install.sh @@ -1,4 +1,6 @@ -install() { +#!/bin/bash + +function __init_nerdfont() { set -e set -u @@ -21,4 +23,4 @@ install() { echo "Installed $my_nerdfont to ~/$my_fontdir" } -install +__init_nerdfont diff --git a/nerdfonts/install.sh b/nerdfonts/install.sh index bc37cfb..fe4f221 100644 --- a/nerdfonts/install.sh +++ b/nerdfonts/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: nerd-fonts (nerdfont alias) # homepage: https://webinstall.dev/nerdfont # tagline: Alias for https://webinstall.dev/nerdfont diff --git a/node/install.sh b/node/install.sh index b0f822a..f321ab5 100644 --- a/node/install.sh +++ b/node/install.sh @@ -12,7 +12,7 @@ set -u pkg_cmd_name="node" #WEBI_SINGLE="" -pkg_get_current_version() { +function 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 @@ pkg_get_current_version() { sed 's:^v::' } -pkg_install() { +function pkg_install() { # mkdir -p $HOME/.local/opt mkdir -p "$(dirname $pkg_src)" @@ -31,7 +31,7 @@ pkg_install() { mv ./"$pkg_cmd_name"* "$pkg_src" } -pkg_link() { +function pkg_link() { # rm -f "$HOME/.local/opt/node" rm -f "$pkg_dst" @@ -42,6 +42,6 @@ pkg_link() { "$pkg_src"/bin/node "$pkg_src"/bin/npm config set scripts-prepend-node-path=true } -pkg_done_message() { +function pkg_done_message() { echo "Installed 'node' and 'npm' at $pkg_dst" } diff --git a/pandoc/install.sh b/pandoc/install.sh index 5141a0f..18e9625 100644 --- a/pandoc/install.sh +++ b/pandoc/install.sh @@ -1,4 +1,5 @@ -{ +#!/bin/bash +function __init_pandoc{ set -e set -u @@ -41,3 +42,5 @@ echo $(pandoc --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2) } } + +__init_pandoc diff --git a/pathman/install.sh b/pathman/install.sh index 0d93ef5..a720f76 100644 --- a/pathman/install.sh +++ b/pathman/install.sh @@ -6,11 +6,11 @@ set -u pkg_cmd_name="pathman" WEBI_SINGLE=true -pkg_get_current_version() { +function pkg_get_current_version() { echo $(pathman version 2> /dev/null | head -n 1 | cut -d ' ' -f2 | sed 's:^v::') } -pkg_done_message() { +function pkg_done_message() { # no message true } diff --git a/postgres/install.sh b/postgres/install.sh index 35d4625..ca41f2c 100644 --- a/postgres/install.sh +++ b/postgres/install.sh @@ -1,3 +1,5 @@ +#!/bin/bash + set -e set -u @@ -6,7 +8,7 @@ pkg_cmd_name="postgres" POSTGRES_DATA_DIR=$HOME/.local/share/postgres/var -pkg_get_current_version() { +function pkg_get_current_version() { # 'postgres --version' has output in this format: # postgres (PostgreSQL) 10.13 # This trims it down to just the version number: @@ -14,7 +16,7 @@ pkg_get_current_version() { echo "$(postgres --version 2> /dev/null | head -n 1 | cut -d' ' -f3)" } -pkg_install() { +function pkg_install() { # mkdir -p $HOME/.local/opt mkdir -p "$(dirname $pkg_src)" @@ -22,7 +24,7 @@ pkg_install() { mv ./"p"* "$pkg_src" } -pkg_link() { +function pkg_link() { # rm -f "$HOME/.local/opt/postgres" rm -f "$pkg_dst" rm -f "$HOME/Applications/pgAdmin"*.app || true @@ -33,7 +35,7 @@ pkg_link() { ln -s "$pkg_src/pgAdmin 4.app" "$HOME/Applications/pgAdmin 4.app" || true } -pkg_post_install() { +function pkg_post_install() { webi_path_add "$pkg_dst_bin" #echo "Initializing PostgreSQL with database at $POSTGRES_DATA_DIR/" @@ -51,7 +53,7 @@ pkg_post_install() { fi } -pkg_done_message() { +function pkg_done_message() { # TODO show with serviceman echo "Installed 'postgres' and 'psql' at $pkg_dst" echo "" diff --git a/postgresql/install.sh b/postgresql/install.sh index 3254244..7f2aecc 100644 --- a/postgresql/install.sh +++ b/postgresql/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: PostgreSQL (Postgres alias) # homepage: https://webinstall.dev/postgres # tagline: Alias for https://webinstall.dev/postgres diff --git a/powershell/install.sh b/powershell/install.sh index 5a81b9b..01f5d02 100644 --- a/powershell/install.sh +++ b/powershell/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_powershell() { set -e set -u @@ -40,3 +40,5 @@ echo "Installed 'pwsh' at $pkg_dst" } } + +__init_powershell diff --git a/prettier/install.sh b/prettier/install.sh index 7df196f..cf26aae 100644 --- a/prettier/install.sh +++ b/prettier/install.sh @@ -1,7 +1,11 @@ #!/bin/bash -if [ -z "$(npm --version 2> /dev/null)" ]; then - webi node - export PATH="$HOME/.local/opt/node/bin:$PATH" -fi -npm install -g prettier@latest +function __init_prettier() { + if [ -z "$(npm --version 2> /dev/null)" ]; then + webi node + export PATH="$HOME/.local/opt/node/bin:$PATH" + fi + npm install -g prettier@latest +} + +__init_prettier diff --git a/pwsh/install.sh b/pwsh/install.sh index 194fae2..d40fecb 100644 --- a/pwsh/install.sh +++ b/pwsh/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: PowerShell (pwsh alias) # homepage: https://webinstall.dev/powershell # tagline: Alias for https://webinstall.dev/powershell diff --git a/rg/install.sh b/rg/install.sh index 88afcb3..397e1a9 100644 --- a/rg/install.sh +++ b/rg/install.sh @@ -2,7 +2,7 @@ set -e set -u -function __install_rg() { +function __init_rg() { ################### # Install ripgrep # @@ -39,4 +39,4 @@ function __install_rg() { } } -__install_rg +__init_rg diff --git a/ripgrep/install.sh b/ripgrep/install.sh index 59b5ea7..9740211 100644 --- a/ripgrep/install.sh +++ b/ripgrep/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: Ripgrep (alias) # homepage: https://webinstall.dev/rg # tagline: `ripgrep` (project) is an alias for `rg` (command) diff --git a/rust/install.sh b/rust/install.sh index 6f2f87e..33c06cb 100644 --- a/rust/install.sh +++ b/rust/install.sh @@ -1,3 +1,4 @@ +#!/bin/bash # title: Rust (rustlang alias) # homepage: https://webinstall.dev/rustlang # tagline: Alias for https://webinstall.dev/rustlang diff --git a/sd/install.sh b/sd/install.sh index fb4ea8a..0d73cdd 100644 --- a/sd/install.sh +++ b/sd/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_sd() { set -e set -u @@ -36,3 +36,5 @@ } } + +__init_sd diff --git a/shfmt/install.sh b/shfmt/install.sh index 016b420..c2d2123 100644 --- a/shfmt/install.sh +++ b/shfmt/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_shfmt() { set -e set -u @@ -28,3 +28,5 @@ } } + +__init_shfmt diff --git a/ssh-utils/install.sh b/ssh-utils/install.sh index 811377f..e0be04b 100644 --- a/ssh-utils/install.sh +++ b/ssh-utils/install.sh @@ -1,7 +1,11 @@ -{ +#!/bin/bash + +function __init_ssh_utils() { rm -f "$HOME/.local/bin/ssh-pubkey" "$HOME/.local/bin/ssh-setpass" "$HOME/.local/bin/ssh-adduser" webi_download "$WEBI_HOST/packages/ssh-utils/ssh-pubkey.sh" "$HOME/.local/bin/ssh-pubkey" webi_download "$WEBI_HOST/packages/ssh-utils/ssh-setpass.sh" "$HOME/.local/bin/ssh-setpass" webi_download "$WEBI_HOST/packages/ssh-utils/ssh-adduser.sh" "$HOME/.local/bin/ssh-adduser" chmod a+x "$HOME/.local/bin/ssh-"* } + +__init_ssh_utils diff --git a/ssh-utils/ssh-setpass.sh b/ssh-utils/ssh-setpass.sh index 4d399cd..a68cf57 100644 --- a/ssh-utils/ssh-setpass.sh +++ b/ssh-utils/ssh-setpass.sh @@ -1,8 +1,10 @@ #!/bin/bash -{ +function __init_ssh_setpass() { set -e set -u ssh-keygen -p -f "$HOME/.ssh/id_rsa" } + +__init_ssh_setpass diff --git a/sudo/install.sh b/sudo/install.sh index 4724b3d..679c86b 100644 --- a/sudo/install.sh +++ b/sudo/install.sh @@ -1,7 +1,9 @@ +#!/bin/bash + set -e set -u -{ +function __init_sudo() { if [ -z "$(command -v sudo)" ]; then echo >&2 "Error: on Linux and BSD you should install sudo via the native package manager" @@ -12,3 +14,5 @@ set -u fi } + +__init_sudo diff --git a/vim-beyondcode/install.sh b/vim-beyondcode/install.sh index ea8bcd0..3509710 100644 --- a/vim-beyondcode/install.sh +++ b/vim-beyondcode/install.sh @@ -1,24 +1,29 @@ -# mostly lightweight, or essential -webi \ - vim-leader \ - vim-shell \ - vim-sensible \ - vim-viminfo \ - vim-lastplace \ - vim-spell \ - vim-ale \ - vim-prettier \ - vim-whitespace +#!/bin/bash -# requires special hardware (mouse) or software (nerdfont) -webi \ - vim-gui \ - vim-nerdtree \ - nerdfont \ - vim-devicons +function __init_vim_beyondcode() { + # mostly lightweight, or essential + webi \ + vim-leader \ + vim-shell \ + vim-sensible \ + vim-viminfo \ + vim-lastplace \ + vim-spell \ + vim-ale \ + vim-prettier \ + vim-whitespace -if [ -n "$(command -v go)" ]; then - webi vim-go -fi + # requires special hardware (mouse) or software (nerdfont) + webi \ + vim-gui \ + vim-nerdtree \ + nerdfont \ + vim-devicons -# done + if [ -n "$(command -v go)" ]; then + webi vim-go + fi + # done +} + +__init_vim_beyondcode diff --git a/vim-essentials/install.sh b/vim-essentials/install.sh index 9be7ed7..8c446b3 100644 --- a/vim-essentials/install.sh +++ b/vim-essentials/install.sh @@ -1,22 +1,28 @@ -webi \ - vim-leader \ - vim-shell \ - vim-sensible \ - vim-viminfo \ - vim-lastplace \ - vim-spell \ - vim-ale \ - vim-prettier \ - vim-whitespace -# done +#!/bin/bash -printf '\n' -printf 'Suggestion: Also check out these great plugins:\n' -printf '\n' -printf ' - vim-nerdtree (better than the default file browser)\n' -printf ' - vim-gui (mouse & clipboard support)\n' -printf ' - vim-devicons (use nerdfont icons in vim)\n' -printf '\n' -printf ' - vim-go (golang linting, etc)\n' -printf ' - vim-rust (rustlang linting, etc)\n' -printf '\n' +function __init_vim_essentials() { + webi \ + vim-leader \ + vim-shell \ + vim-sensible \ + vim-viminfo \ + vim-lastplace \ + vim-spell \ + vim-ale \ + vim-prettier \ + vim-whitespace + # done + + printf '\n' + printf 'Suggestion: Also check out these great plugins:\n' + printf '\n' + printf ' - vim-nerdtree (better than the default file browser)\n' + printf ' - vim-gui (mouse & clipboard support)\n' + printf ' - vim-devicons (use nerdfont icons in vim)\n' + printf '\n' + printf ' - vim-go (golang linting, etc)\n' + printf ' - vim-rust (rustlang linting, etc)\n' + printf '\n' +} + +__init_vim_essentials diff --git a/vps-addswap/install.sh b/vps-addswap/install.sh index dd0bf5b..12ddbcd 100644 --- a/vps-addswap/install.sh +++ b/vps-addswap/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_vps_addswap() { set -e set -u @@ -31,3 +31,5 @@ # Cause swap to be activated on boot echo '/var/swapfile none swap sw 0 0' | tee -a /etc/fstab } + +__init_vps_addswap "$@" diff --git a/vps-utils/install.sh b/vps-utils/install.sh index 1f664e9..1e260a9 100644 --- a/vps-utils/install.sh +++ b/vps-utils/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_vps_utils() { set -e set -u @@ -13,3 +13,5 @@ chmod a+x "$HOME/.local/bin/myip" chmod a+x "$HOME/.local/bin/vps-"* } + +__init_vps_utils diff --git a/watchexec/install.sh b/watchexec/install.sh index 99d4f0d..d6fba6e 100644 --- a/watchexec/install.sh +++ b/watchexec/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_watchexec() { set -e set -u @@ -37,3 +37,5 @@ } } + +__init_watchexec diff --git a/xz/install.sh b/xz/install.sh index 7ff18a5..390ea1d 100644 --- a/xz/install.sh +++ b/xz/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_xz() { set -e set -u @@ -45,3 +45,5 @@ echo $(xz --version 2> /dev/null | head -n 1 | cut -d ' ' -f 4) } } + +__init_xz diff --git a/yq/install.sh b/yq/install.sh index f165134..8e445a5 100644 --- a/yq/install.sh +++ b/yq/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -{ +function __init_yq() { set -e set -u @@ -34,3 +34,5 @@ } } + +__init_yq diff --git a/zoxide/install.sh b/zoxide/install.sh index 2111e3b..c9383b6 100644 --- a/zoxide/install.sh +++ b/zoxide/install.sh @@ -33,7 +33,7 @@ function __init_zoxide() { # zoxide v0.5.0-31-g8452961 # This trims it down to just the version number: # 0.5.0 - zoxide --version 2>/dev/null | head -n 1 | cut -d '-' -f 1 | cut -b '9-' + zoxide --version 2> /dev/null | head -n 1 | cut -d '-' -f 1 | cut -b '9-' } # shellcheck disable=SC2016 -- 2.25.1