diff --git a/files/bash/.bashrc b/files/bash/.bashrc index c0d9cf0..1e9a635 100644 --- a/files/bash/.bashrc +++ b/files/bash/.bashrc @@ -225,29 +225,9 @@ fi ## extra paths ## -# # ruby (rbenv) -# if command -v ruby > /dev/null && command -v gem > /dev/null; then -# appendpath "$(ruby -r rubygems -e 'puts Gem.user_dir')/bin" -# # rbenv shim -# if [ -d "$HOME/.rbenv/bin" ]; then -# appendpath "$HOME/.rbenv/bin" -# [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init -)" -# fi -# fi - -# # node (nvm) -# if [ -d "$HOME/.nvm" ]; then -# export NVM_DIR="$HOME/.nvm" -# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" -# fi - -# # python (pyenv) -# if [ -d "$HOME/.pyenv" ]; then -# export PYENV_ROOT="$HOME/.pyenv" -# appendpath "$PYENV_ROOT/bin" -# command -v pyenv > /dev/null && eval "$(pyenv init -)" -# fi +# local bins +[ -d "$HOME/.local/bin" ] && appendpath "$HOME/.local/bin" +[ -d "$HOME/.local/scripts" ] && appendpath "$HOME/.local/scripts" # go if command -v go > /dev/null; then @@ -263,9 +243,34 @@ if command -v cargo > /dev/null; then appendpath "$HOME/.cargo/bin" fi -# local bins -[ -d "$HOME/.local/bin" ] && appendpath "$HOME/.local/bin" -[ -d "$HOME/.local/scripts" ] && appendpath "$HOME/.local/scripts" +## version managers ## + +src_rbenv(){ + if command -v ruby > /dev/null && command -v gem > /dev/null; then + appendpath "$(ruby -r rubygems -e 'puts Gem.user_dir')/bin" + # rbenv shim + if [ -d "$HOME/.rbenv/bin" ]; then + appendpath "$HOME/.rbenv/bin" + [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init -)" + fi + fi +} + +src_nvm(){ + if [ -d "$HOME/.nvm" ]; then + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + fi +} + +src_pyenv() { + if [ -d "$HOME/.pyenv" ]; then + export PYENV_ROOT="$HOME/.pyenv" + appendpath "$PYENV_ROOT/bin" + command -v pyenv > /dev/null && eval "$(pyenv init -)" + fi +} ## extra tools ##