Fix path handling in hacking/env-setup.
This commit is contained in:
parent
1bb4d232f3
commit
0392dbeba1
1 changed files with 19 additions and 3 deletions
|
@ -1,6 +1,22 @@
|
||||||
# usage: source hacking/env-setup [-q]
|
# usage: source hacking/env-setup [-q]
|
||||||
# modifies environment for running Ansible from checkout
|
# modifies environment for running Ansible from checkout
|
||||||
|
|
||||||
|
# prepend a value to a potentially empty path variable
|
||||||
|
# usage: prepend_path variable_name value
|
||||||
|
prepend_path()
|
||||||
|
{
|
||||||
|
variable_name="$1"
|
||||||
|
value="$2"
|
||||||
|
|
||||||
|
old_value=$( eval "echo \$$variable_name" )
|
||||||
|
|
||||||
|
if [ "x$old_value" != "x" ]; then
|
||||||
|
value="$value:"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export "$variable_name=$value$old_value"
|
||||||
|
}
|
||||||
|
|
||||||
# Default values for shell variables we use
|
# Default values for shell variables we use
|
||||||
PYTHONPATH=${PYTHONPATH-""}
|
PYTHONPATH=${PYTHONPATH-""}
|
||||||
PATH=${PATH-""}
|
PATH=${PATH-""}
|
||||||
|
@ -34,9 +50,9 @@ PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
|
||||||
PREFIX_PATH="$ANSIBLE_HOME/bin:$ANSIBLE_HOME/test/runner"
|
PREFIX_PATH="$ANSIBLE_HOME/bin:$ANSIBLE_HOME/test/runner"
|
||||||
PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"
|
PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"
|
||||||
|
|
||||||
expr "$PYTHONPATH" : "${PREFIX_PYTHONPATH}.*" > /dev/null || export PYTHONPATH="$PREFIX_PYTHONPATH:$PYTHONPATH"
|
expr "$PYTHONPATH" : "${PREFIX_PYTHONPATH}.*" > /dev/null || prepend_path PYTHONPATH "$PREFIX_PYTHONPATH"
|
||||||
expr "$PATH" : "${PREFIX_PATH}.*" > /dev/null || export PATH="$PREFIX_PATH:$PATH"
|
expr "$PATH" : "${PREFIX_PATH}.*" > /dev/null || prepend_path PATH "$PREFIX_PATH"
|
||||||
expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || export MANPATH="$PREFIX_MANPATH:$MANPATH"
|
expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || prepend_path MANPATH "$PREFIX_MANPATH"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Generate egg_info so that pkg_resources works
|
# Generate egg_info so that pkg_resources works
|
||||||
|
|
Loading…
Reference in a new issue