diff --git a/rc/bashrc b/rc/bashrc index 40d3d25e..f0c5bd50 100755 --- a/rc/bashrc +++ b/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]}') diff --git a/rc/zshrc b/rc/zshrc index c3e99965..d56e2822 100755 --- a/rc/zshrc +++ b/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]}')