From 243197f2d466d17082cb5334db7dcb2025f47bc7 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Tue, 12 Sep 2023 11:31:19 -0400 Subject: [PATCH] env-setup.fish: Correct syntax errors (#81677) - Single quote regular expression values to avoid shell expansion - Properly test if the $QUIET variable is set and non-zero --- hacking/env-setup.fish | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hacking/env-setup.fish b/hacking/env-setup.fish index ebc9afcc5dd..529b57333ef 100644 --- a/hacking/env-setup.fish +++ b/hacking/env-setup.fish @@ -23,16 +23,16 @@ set -gx PREFIX_MANPATH $ANSIBLE_HOME/docs/man # Set PYTHONPATH if not set -q PYTHONPATH set -gx PYTHONPATH $PREFIX_PYTHONPATH -else if not string match -qr "$PREFIX_PYTHONPATH($|:)" $PYTHONPATH - if not $QUIET +else if not string match -qr $PREFIX_PYTHONPATH'($|:)' $PYTHONPATH + if not test -n "$QUIET" echo "Appending PYTHONPATH" end set -gx PYTHONPATH "$PREFIX_PYTHONPATH:$PYTHONPATH" end # Set ansible_test PYTHONPATH -if not string match -qr "$ANSIBLE_TEST_PREFIX_PYTHONPATH($|:)" $PYTHONPATH - if not $QUIET +if not string match -qr $ANSIBLE_TEST_PREFIX_PYTHONPATH'($|:)' $PYTHONPATH + if not test -n "$QUIET" echo "Appending PYTHONPATH" end set -gx PYTHONPATH "$ANSIBLE_TEST_PREFIX_PYTHONPATH:$PYTHONPATH" @@ -46,7 +46,7 @@ end # Set MANPATH if not set -q MANPATH set -gx MANPATH $PREFIX_MANPATH -else if not string match -qr "$PREFIX_MANPATH($|:)" $MANPATH +else if not string match -qr $PREFIX_MANPATH'($|:)' $MANPATH set -gx MANPATH "$PREFIX_MANPATH:$MANPATH" end @@ -71,11 +71,11 @@ function gen_egg_info rm -rf $PREFIX_PYTHONPATH/ansible*.egg-info end # Execute setup.py egg_info using the chosen Python interpreter - (eval $PYTHON_BIN setup.py egg_info) + eval $PYTHON_BIN setup.py egg_info end pushd $ANSIBLE_HOME -if $QUIET +if test -n "$QUIET" # Run gen_egg_info in the background and redirect output to /dev/null gen_egg_info &> /dev/null # Remove any .pyc files found