hotfix: always use full PATH to 'webi' command

This commit is contained in:
AJ ONeal
2022-08-08 12:44:54 +00:00
parent 509e957842
commit 8d70f74765
11 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
}
+1 -1
View File
@@ -3,7 +3,7 @@ set -e
set -u
function __init_vim_essentials() {
webi \
"$HOME/.local/bin/webi" \
vim-leader \
vim-shell \
vim-sensible \
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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