diff --git a/plugins/available/jenv.plugin.bash b/plugins/available/jenv.plugin.bash index 3cb2bcfc..08470688 100644 --- a/plugins/available/jenv.plugin.bash +++ b/plugins/available/jenv.plugin.bash @@ -4,6 +4,4 @@ about-plugin 'load jenv, if you are using it' export JENV_ROOT="$HOME/.jenv" pathmunge "$JENV_ROOT/bin" -if which jenv > /dev/null; then eval "$(jenv init -)"; fi - -[[ -e $JENV_ROOT/completions/jenv.bash ]] && source $JENV_ROOT/completions/jenv.bash +if which jenv > /dev/null; then eval "$(jenv init - bash)"; fi diff --git a/plugins/available/nodenv.plugin.bash b/plugins/available/nodenv.plugin.bash index f28e4045..1bbe7fbd 100644 --- a/plugins/available/nodenv.plugin.bash +++ b/plugins/available/nodenv.plugin.bash @@ -4,7 +4,4 @@ about-plugin 'load nodenv, if you are using it' export NODENV_ROOT="$HOME/.nodenv" pathmunge "$NODENV_ROOT/bin" -[[ `which nodenv` ]] && eval "$(nodenv init -)" - -# Load the auto-completion script if nodenv was loaded. -[[ -e $NODENV_ROOT/completions/nodenv.bash ]] && source $NODENV_ROOT/completions/nodenv.bash +[[ `which nodenv` ]] && eval "$(nodenv init - bash)" diff --git a/plugins/available/plenv.plugin.bash b/plugins/available/plenv.plugin.bash index 1e527b72..1da2d61b 100644 --- a/plugins/available/plenv.plugin.bash +++ b/plugins/available/plenv.plugin.bash @@ -4,18 +4,15 @@ cite about-plugin about-plugin 'plenv plugin for Perl' if [[ -e "${HOME}/.plenv/bin" ]] ; then - + # load plenv bin dir into path if it exists pathmunge "${HOME}/.plenv/bin" - + fi if [[ `which plenv` ]] ; then # init plenv - eval "$(plenv init -)" - - # Load the auto-completion script if it exists. - [[ -e "${HOME}/.plenv/completions/plenv.bash" ]] && source "${HOME}/.plenv/completions/plenv.bash" + eval "$(plenv init - bash)" fi diff --git a/plugins/available/pyenv.plugin.bash b/plugins/available/pyenv.plugin.bash index 0f6bffb8..dced31a8 100644 --- a/plugins/available/pyenv.plugin.bash +++ b/plugins/available/pyenv.plugin.bash @@ -4,12 +4,9 @@ about-plugin 'load pyenv, if you are using it' export PYENV_ROOT="$HOME/.pyenv" pathmunge "$PYENV_ROOT/bin" -[[ `which pyenv` ]] && eval "$(pyenv init -)" +[[ `which pyenv` ]] && eval "$(pyenv init - bash)" #Load pyenv virtualenv if the virtualenv plugin is installed. if pyenv virtualenv-init - &> /dev/null; then - eval "$(pyenv virtualenv-init -)" + eval "$(pyenv virtualenv-init - bash)" fi - -# Load the auto-completion script if pyenv was loaded. -[[ -e $PYENV_ROOT/completions/pyenv.bash ]] && source $PYENV_ROOT/completions/pyenv.bash diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash index 75d24154..ecba0c89 100644 --- a/plugins/available/rbenv.plugin.bash +++ b/plugins/available/rbenv.plugin.bash @@ -4,7 +4,4 @@ about-plugin 'load rbenv, if you are using it' export RBENV_ROOT="$HOME/.rbenv" pathmunge "$RBENV_ROOT/bin" -[[ `which rbenv` ]] && eval "$(rbenv init -)" - -# Load the auto-completion script if rbenv was loaded. -[[ -e $RBENV_ROOT/completions/rbenv.bash ]] && source $RBENV_ROOT/completions/rbenv.bash +[[ `which rbenv` ]] && eval "$(rbenv init - bash)"