Skip to content

A
ansible
Commit b8921706 by Marco Ippolito Committed by Toshio Kuratomi
Options

Prefer modern-style Bash command substitution in hacking/env-setup 

Conflicts:
	hacking/env-setup
parent 31c85233
Showing with 4 additions and 4 deletions
hacking/env-setup
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
# When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE # When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
if [ -n "$BASH_SOURCE" ] ; then if [ -n "$BASH_SOURCE" ] ; then
HACKING_DIR=`dirname $BASH_SOURCE` HACKING_DIR=$(dirname $BASH_SOURCE)
elif [ $(basename $0) = "env-setup" ]; then elif [ $(basename $0) = "env-setup" ]; then
HACKING_DIR=`dirname $0` HACKING_DIR=$(dirname $0)
else else
HACKING_DIR="$PWD/hacking" HACKING_DIR="$PWD/hacking"
fi fi
# The below is an alternative to readlink -fn which doesn't exist on OS X # The below is an alternative to readlink -fn which doesn't exist on OS X
# Source: http://stackoverflow.com/a/1678636 # Source: http://stackoverflow.com/a/1678636
FULL_PATH=`python -c "import os; print(os.path.realpath('$HACKING_DIR'))"` FULL_PATH=$(python -c "import os; print(os.path.realpath('$HACKING_DIR'))")
ANSIBLE_HOME=`dirname "$FULL_PATH"` ANSIBLE_HOME=$(dirname "$FULL_PATH")
PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib" PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
PREFIX_PATH="$ANSIBLE_HOME/bin" PREFIX_PATH="$ANSIBLE_HOME/bin"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment