Merge pull request #2141 from dorfsmay/pullreq-env-simple

Prevents PATH, PYTHONPATH etc... to be re-added.
12 years ago · 52a990ec2b
parent 6d604469d8 dfdc5bda4b
commit 52a990ec2b
1 changed files with 3 additions and 3 deletions
--- a/hacking/env-setup
+++ b/hacking/env-setup
@ -17,10 +17,10 @@ PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
 PREFIX_PATH="$ANSIBLE_HOME/bin"
 PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"

-export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH
-export PATH=$PREFIX_PATH:$PATH
+[[ $PYTHONPATH != ${PREFIX_PYTHONPATH}* ]] && export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH
+[[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH
 export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library"
-export MANPATH=$PREFIX_MANPATH:$MANPATH
+[[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH

 # Print out values unless -q is set