mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-12-22 18:52:45 +01:00
{bash,zsh}rc: move goenv higher up to not interfere with other envs
This commit is contained in:
parent
9d7089ea44
commit
e4d723c770
20
rc/bashrc
20
rc/bashrc
@ -260,6 +260,16 @@ export LOCALDOMAIN=.
|
||||
# regardless of whether DNSSEC=true or not.
|
||||
export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
|
||||
|
||||
# https://github.com/go-nv/goenv
|
||||
if [ -d ~/.goenv/bin ]; then
|
||||
export GOENV_ROOT="$HOME/.goenv"
|
||||
PATH="$HOME/.goenv/bin:$PATH"
|
||||
#goenv init > /dev/null 2>&1
|
||||
eval "$(goenv init -)"
|
||||
PATH="$GOROOT/bin:$PATH"
|
||||
PATH="$PATH:$GOPATH/bin"
|
||||
fi
|
||||
|
||||
# https://github.com/nvm-sh/nvm
|
||||
if [ -d ~/.nvm ]; then
|
||||
. ~/.nvm/nvm.sh
|
||||
@ -296,16 +306,6 @@ if [ -d ~/.nodenv/bin ]; then
|
||||
# git clone https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build
|
||||
fi
|
||||
|
||||
# https://github.com/go-nv/goenv
|
||||
if [ -d ~/.goenv/bin ]; then
|
||||
export GOENV_ROOT="$HOME/.goenv"
|
||||
PATH="$HOME/.goenv/bin:$PATH"
|
||||
#goenv init > /dev/null 2>&1
|
||||
eval "$(goenv init -)"
|
||||
PATH="$GOROOT/bin:$PATH"
|
||||
PATH="$PATH:$GOPATH/bin"
|
||||
fi
|
||||
|
||||
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
|
||||
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
|
||||
|
||||
|
20
rc/zshrc
20
rc/zshrc
@ -225,6 +225,16 @@ export LOCALDOMAIN=.
|
||||
# regardless of whether DNSSEC=true or not.
|
||||
export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
|
||||
|
||||
# https://github.com/go-nv/goenv
|
||||
if [ -d ~/.goenv/bin ]; then
|
||||
export GOENV_ROOT="$HOME/.goenv"
|
||||
PATH="$HOME/.goenv/bin:$PATH"
|
||||
#goenv init > /dev/null 2>&1
|
||||
eval "$(goenv init -)"
|
||||
PATH="$GOROOT/bin:$PATH"
|
||||
PATH="$PATH:$GOPATH/bin"
|
||||
fi
|
||||
|
||||
# https://github.com/nvm-sh/nvm
|
||||
if [ -d ~/.nvm ]; then
|
||||
. ~/.nvm/nvm.sh
|
||||
@ -261,16 +271,6 @@ if [ -d ~/.nodenv/bin ]; then
|
||||
# git clone https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build
|
||||
fi
|
||||
|
||||
# https://github.com/go-nv/goenv
|
||||
if [ -d ~/.goenv/bin ]; then
|
||||
export GOENV_ROOT="$HOME/.goenv"
|
||||
PATH="$HOME/.goenv/bin:$PATH"
|
||||
#goenv init > /dev/null 2>&1
|
||||
eval "$(goenv init -)"
|
||||
PATH="$GOROOT/bin:$PATH"
|
||||
PATH="$PATH:$GOPATH/bin"
|
||||
fi
|
||||
|
||||
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
|
||||
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user