diff --git a/git-config-gpg/git-config-gpg.sh b/git-config-gpg/git-config-gpg.sh index 324bd00..0180a41 100644 --- a/git-config-gpg/git-config-gpg.sh +++ b/git-config-gpg/git-config-gpg.sh @@ -8,7 +8,7 @@ function __git_gpg_init() { # TODO check for public key without gpg-pubkey? if ! command -v gpg-pubkey; then - webi gpg-pubkey + "$HOME/.local/bin/webi" gpg-pubkey else gpg-pubkey fi diff --git a/git-config-gpg/install.sh b/git-config-gpg/install.sh index b198bee..8bf3c5a 100644 --- a/git-config-gpg/install.sh +++ b/git-config-gpg/install.sh @@ -12,7 +12,7 @@ function __install_git_gpg_init() { function __check_gpg_pubkey_exists() { if ! command -v gpg; then - webi gpg-pubkey + "$HOME/.local/bin/webi" gpg-pubkey export PATH="$HOME/.local/opt/gnupg/bin:$PATH" export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH" fi @@ -20,7 +20,7 @@ function __check_gpg_pubkey_exists() { function __check_gpg_exists() { if ! command -v gpg; then - webi gpg + "$HOME/.local/bin/webi" gpg export PATH="$HOME/.local/opt/gnupg/bin:$PATH" export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH" fi diff --git a/go-essentials/install.sh b/go-essentials/install.sh index 89db777..f37cbed 100644 --- a/go-essentials/install.sh +++ b/go-essentials/install.sh @@ -6,7 +6,7 @@ __run_go_essentials() { WEBI__GO_ESSENTIALS='true' export WEBI__GO_ESSENTIALS if [ -z "${WEBI__GO_INSTALL:-}" ]; then - webi "golang@${WEBI_TAG}" + "$HOME/.local/bin/webi" "golang@${WEBI_TAG}" fi export PATH="$HOME/.local/opt/go/bin:$PATH" diff --git a/golang/install.sh b/golang/install.sh index 1c69124..e596d0e 100644 --- a/golang/install.sh +++ b/golang/install.sh @@ -73,7 +73,7 @@ function pkg_post_install() { # TODO nix for go1.21+ WEBI__GO_INSTALL='true' export WEBI__GO_INSTALL - webi "go-essentials@${WEBI_TAG}" + "$HOME/.local/bin/webi" "go-essentials@${WEBI_TAG}" fi } diff --git a/gpg-pubkey/install.sh b/gpg-pubkey/install.sh index fa80ed6..98df4b7 100644 --- a/gpg-pubkey/install.sh +++ b/gpg-pubkey/install.sh @@ -21,7 +21,7 @@ function __install_gpg_pubkey_id() { function __check_gpg_exists() { if ! command -v gpg; then - webi gpg + "$HOME/.local/bin/webi" gpg export PATH="$HOME/.local/opt/gnupg/bin:$PATH" export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH" fi diff --git a/jshint/install.sh b/jshint/install.sh index 87f0d84..7f5d68e 100644 --- a/jshint/install.sh +++ b/jshint/install.sh @@ -7,7 +7,7 @@ function __init_jshint() { PATH="${HOME}/.local/opt/node/bin:${PATH}" if [ -z "$(npm --version 2> /dev/null)" ]; then export PATH="${OLD_PATH}" - webi node + "$HOME/.local/bin/webi" node export PATH="${HOME}/.local/opt/node/bin:${PATH}" fi npm install -g jshint@latest diff --git a/prettier/install.sh b/prettier/install.sh index d1ed3fe..ab66302 100644 --- a/prettier/install.sh +++ b/prettier/install.sh @@ -4,7 +4,7 @@ set -u function __init_prettier() { if [ -z "$(npm --version 2> /dev/null)" ]; then - webi node + "$HOME/.local/bin/webi" node export PATH="$HOME/.local/opt/node/bin:$PATH" fi npm install -g prettier@latest diff --git a/vim-beyondcode/install.sh b/vim-beyondcode/install.sh index 574b281..64bd4cf 100644 --- a/vim-beyondcode/install.sh +++ b/vim-beyondcode/install.sh @@ -4,7 +4,7 @@ set -u function __init_vim_beyondcode() { # mostly lightweight, or essential - webi \ + "$HOME/.local/bin/webi" \ vim-leader \ vim-shell \ vim-sensible \ @@ -16,14 +16,14 @@ function __init_vim_beyondcode() { vim-whitespace # requires special hardware (mouse) or software (nerdfont) - webi \ + "$HOME/.local/bin/webi" \ vim-gui \ vim-nerdtree \ nerdfont \ vim-devicons if [ -n "$(command -v go)" ]; then - webi vim-go + "$HOME/.local/bin/webi" vim-go fi # done } diff --git a/vim-essentials/install.sh b/vim-essentials/install.sh index 21c5121..26aa0f1 100644 --- a/vim-essentials/install.sh +++ b/vim-essentials/install.sh @@ -3,7 +3,7 @@ set -e set -u function __init_vim_essentials() { - webi \ + "$HOME/.local/bin/webi" \ vim-leader \ vim-shell \ vim-sensible \ diff --git a/vim-prettier/install.sh b/vim-prettier/install.sh index a23337a..7d34cba 100644 --- a/vim-prettier/install.sh +++ b/vim-prettier/install.sh @@ -10,7 +10,7 @@ function __init_vim_prettier() { if [ -z "$(command -v node)" ]; then export PATH="$HOME/.local/opt/node/bin:$HOME/.local/bin:${PATH}" - webi node + "$HOME/.local/bin/webi" node fi npm install -g prettier@2 diff --git a/vim-shfmt/install.sh b/vim-shfmt/install.sh index 36aea7e..240a82e 100644 --- a/vim-shfmt/install.sh +++ b/vim-shfmt/install.sh @@ -10,10 +10,10 @@ function __init_vim_shfmt() { export PATH="$HOME/.local/bin:${PATH}" if [ -z "$(command -v shfmt)" ]; then - webi shfmt + "$HOME/.local/bin/webi" shfmt fi if [ -z "$(command -v shellcheck)" ]; then - webi shellcheck + "$HOME/.local/bin/webi" shellcheck fi if [ ! -f "$HOME/.vimrc" ]; then