mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
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>
This commit is contained in:
parent
4b9f8fc294
commit
9f4988dbfd
1 changed files with 8 additions and 8 deletions
|
@ -7,23 +7,23 @@
|
|||
# When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
|
||||
case "$0" in
|
||||
(bash)
|
||||
HACKING_DIR=${BASH_SOURCE%/*};;
|
||||
HACKING_DIR="${BASH_SOURCE%/*}";;
|
||||
(*)
|
||||
HACKING_DIR=${0%/*};;
|
||||
HACKING_DIR="${0%/*}";;
|
||||
esac
|
||||
# The below is an alternative to readlink -fn which doesn't exist on OS X
|
||||
# Source: http://stackoverflow.com/a/1678636
|
||||
FULL_PATH=`python -c "import os; print(os.path.realpath('$HACKING_DIR'))"`
|
||||
ANSIBLE_HOME=${FULL_PATH%/*}
|
||||
FULL_PATH=$(python -c "import os; print(os.path.realpath('$HACKING_DIR'))")
|
||||
ANSIBLE_HOME="${FULL_PATH%/*}"
|
||||
|
||||
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
|
||||
[[ "$PYTHONPATH" != "${PREFIX_PYTHONPATH}"* ]] && export PYTHONPATH=$"PREFIX_PYTHONPATH:$PYTHONPATH"
|
||||
[[ "$PATH" != "${PREFIX_PATH}"* ]] && export PATH="$PREFIX_PATH:$PATH"
|
||||
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
|
||||
|
||||
|
@ -36,7 +36,7 @@ if [ $# -eq 0 -o "$1" != "-q" ] ; then
|
|||
echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
|
||||
echo "MANPATH=$MANPATH"
|
||||
echo ""
|
||||
|
||||
|
||||
echo "Remember, you may wish to specify your host file with -i"
|
||||
echo ""
|
||||
echo "Done!"
|
||||
|
|
Loading…
Reference in a new issue