Quote variables in shell script

In case paths contain spaces, it's better to consistently quote
variables, and to use $() instead of `` for external invocations.

Signed-off-by: martin f. krafft <madduck@madduck.net>
pull/3276/head
martin f. krafft 12 years ago
parent 4b9f8fc294
commit 9f4988dbfd

@ -7,23 +7,23 @@
# 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
case "$0" in case "$0" in
(bash) (bash)
HACKING_DIR=${BASH_SOURCE%/*};; HACKING_DIR="${BASH_SOURCE%/*}";;
(*) (*)
HACKING_DIR=${0%/*};; HACKING_DIR="${0%/*}";;
esac esac
# 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=${FULL_PATH%/*} ANSIBLE_HOME="${FULL_PATH%/*}"
PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib" PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib"
PREFIX_PATH="$ANSIBLE_HOME/bin" PREFIX_PATH="$ANSIBLE_HOME/bin"
PREFIX_MANPATH="$ANSIBLE_HOME/docs/man" PREFIX_MANPATH="$ANSIBLE_HOME/docs/man"
[[ $PYTHONPATH != ${PREFIX_PYTHONPATH}* ]] && export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH [[ "$PYTHONPATH" != "${PREFIX_PYTHONPATH}"* ]] && export PYTHONPATH=$"PREFIX_PYTHONPATH:$PYTHONPATH"
[[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH [[ "$PATH" != "${PREFIX_PATH}"* ]] && export PATH="$PREFIX_PATH:$PATH"
export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library" export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library"
[[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH [[ "$MANPATH" != "${PREFIX_MANPATH}"* ]] && export MANPATH="$PREFIX_MANPATH:$MANPATH"
# Print out values unless -q is set # Print out values unless -q is set

Loading…
Cancel
Save