Merge pull request #9975 from ansible/remove-bashism-env-setup

Get rid of bash compound command to make more portable

Merge pull request #9975 from ansible/remove-bashism-env-setup
Get rid of bash compound command to make more portable
ce4f1163 · Toshio Kuratomi · f1fdddb6 · 09e556e9 · ce4f1163
Commit ce4f1163 authored Jan 13, 2015 by Toshio Kuratomi
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

hacking/env-setup
+3 -3

No files found.
--- a/hacking/env-setup
+++ b/hacking/env-setup
@@ -18,9 +18,9 @@ PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
 PREFIX_PATH="$ANSIBLE_HOME/bin"
 PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"

-[[ $PYTHONPATH != ${PREFIX_PYTHONPATH}* ]] && export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH
-[[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH
-[[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH
+expr "$PYTHONPATH" : "${PREFIX_PYTHONPATH}.*" > /dev/null || export PYTHONPATH="$PREFIX_PYTHONPATH:$PYTHONPATH"
+expr "$PATH" : "${PREFIX_PATH}.*" > /dev/null || export PATH="$PREFIX_PATH:$PATH"
+expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || export MANPATH="$PREFIX_MANPATH:$MANPATH"

 #
 # Generate egg_info so that pkg_resources works