From dabf0e8c42027ae83e3ae0eea26ed610062c1932 Mon Sep 17 00:00:00 2001
From: Ivan Povalyukhin <ipovalyukhin@yammer-inc.com>
Date: Sun, 7 Jun 2015 20:08:39 -0700
Subject: [PATCH] [pathmunge] remove duplicate entry into PATH variable on
 reload command

---
 plugins/available/latex.plugin.bash | 2 +-
 plugins/available/pipsi.plugin.bash | 2 +-
 plugins/available/pyenv.plugin.bash | 3 ++-
 plugins/available/rbenv.plugin.bash | 3 ++-
 plugins/available/ruby.plugin.bash  | 2 +-
 plugins/available/todo.plugin.bash  | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/available/latex.plugin.bash b/plugins/available/latex.plugin.bash
index eefec59d..6ebb70d3 100644
--- a/plugins/available/latex.plugin.bash
+++ b/plugins/available/latex.plugin.bash
@@ -4,6 +4,6 @@ about-plugin 'use mactex'
 # add mactex to the path if its present
 MACTEX_PATH=/usr/local/texlive/2009/bin/universal-darwin
 if [[ -d  $MACTEX_PATH ]]; then
-    export PATH=$PATH:$MACTEX_PATH
+  pathmunge $MACTEX_PATH after
 fi
 unset MACTEX_PATH
diff --git a/plugins/available/pipsi.plugin.bash b/plugins/available/pipsi.plugin.bash
index 305e83cc..916d86d2 100644
--- a/plugins/available/pipsi.plugin.bash
+++ b/plugins/available/pipsi.plugin.bash
@@ -3,5 +3,5 @@ about-plugin 'load pipsi, if you are using it'
 
 if [[ -f "$HOME/.local/bin/pipsi" ]]
 then
-    export PATH=~/.local/bin:$PATH
+    pathmunge ~/.local/bin
 fi
diff --git a/plugins/available/pyenv.plugin.bash b/plugins/available/pyenv.plugin.bash
index 7ed2d3cd..8e4f1edd 100644
--- a/plugins/available/pyenv.plugin.bash
+++ b/plugins/available/pyenv.plugin.bash
@@ -2,7 +2,8 @@ cite about-plugin
 about-plugin 'load pyenv, if you are using it'
 
 export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
+pathmunge $PYENV_ROOT
+
 [[ `which pyenv` ]] && eval "$(pyenv init -)"
 
 #Load pyenv virtualenv if the virtualenv plugin is installed.
diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
index 70fe62c3..a6c25559 100644
--- a/plugins/available/rbenv.plugin.bash
+++ b/plugins/available/rbenv.plugin.bash
@@ -3,7 +3,8 @@
 cite about-plugin
 about-plugin 'load rbenv, if you are using it'
 
-export PATH="$HOME/.rbenv/bin:$PATH"
+pathmunge "${HOME}/.rbenv/bin"
+
 [[ `which rbenv` ]] && eval "$(rbenv init -)"
 
 # Load the auto-completion script if rbenv was loaded.
diff --git a/plugins/available/ruby.plugin.bash b/plugins/available/ruby.plugin.bash
index b320cb30..4ab891d9 100644
--- a/plugins/available/ruby.plugin.bash
+++ b/plugins/available/ruby.plugin.bash
@@ -4,7 +4,7 @@ about-plugin 'ruby and rubygems specific functions and settings'
 # Make commands installed with 'gem install --user-install' available
 # ~/.gem/ruby/${RUBY_VERSION}/bin/
 if which ruby >/dev/null && which gem >/dev/null; then
-  PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin";
+  pathmunge "$(ruby -e 'print Gem.user_dir')/bin" after
 fi
 
 function remove_gem {
diff --git a/plugins/available/todo.plugin.bash b/plugins/available/todo.plugin.bash
index 28559def..ef9266e2 100755
--- a/plugins/available/todo.plugin.bash
+++ b/plugins/available/todo.plugin.bash
@@ -15,6 +15,7 @@ fi
 # respect ENV var set in .bash_profile, default is 't'
 alias $TODO='$TODO_SRC_DIR/todo.sh -d $TODO_SRC_DIR/todo.cfg'
 
-export PATH=$PATH:$TODO_SRC_DIR
+pathmunge $TODO_SRC_DIR after
+
 source $TODO_SRC_DIR/todo_completion   # bash completion for todo.sh
 complete -F _todo $TODO                # enable completion for 't' alias