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
pull/81586/head
Sam Doran 9 months ago committed by GitHub
parent 67cdaa49f8
commit 243197f2d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -23,16 +23,16 @@ set -gx PREFIX_MANPATH $ANSIBLE_HOME/docs/man
# Set PYTHONPATH # Set PYTHONPATH
if not set -q PYTHONPATH if not set -q PYTHONPATH
set -gx PYTHONPATH $PREFIX_PYTHONPATH set -gx PYTHONPATH $PREFIX_PYTHONPATH
else if not string match -qr "$PREFIX_PYTHONPATH($|:)" $PYTHONPATH else if not string match -qr $PREFIX_PYTHONPATH'($|:)' $PYTHONPATH
if not $QUIET if not test -n "$QUIET"
echo "Appending PYTHONPATH" echo "Appending PYTHONPATH"
end end
set -gx PYTHONPATH "$PREFIX_PYTHONPATH:$PYTHONPATH" set -gx PYTHONPATH "$PREFIX_PYTHONPATH:$PYTHONPATH"
end end
# Set ansible_test PYTHONPATH # Set ansible_test PYTHONPATH
if not string match -qr "$ANSIBLE_TEST_PREFIX_PYTHONPATH($|:)" $PYTHONPATH if not string match -qr $ANSIBLE_TEST_PREFIX_PYTHONPATH'($|:)' $PYTHONPATH
if not $QUIET if not test -n "$QUIET"
echo "Appending PYTHONPATH" echo "Appending PYTHONPATH"
end end
set -gx PYTHONPATH "$ANSIBLE_TEST_PREFIX_PYTHONPATH:$PYTHONPATH" set -gx PYTHONPATH "$ANSIBLE_TEST_PREFIX_PYTHONPATH:$PYTHONPATH"
@ -46,7 +46,7 @@ end
# Set MANPATH # Set MANPATH
if not set -q MANPATH if not set -q MANPATH
set -gx MANPATH $PREFIX_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" set -gx MANPATH "$PREFIX_MANPATH:$MANPATH"
end end
@ -71,11 +71,11 @@ function gen_egg_info
rm -rf $PREFIX_PYTHONPATH/ansible*.egg-info rm -rf $PREFIX_PYTHONPATH/ansible*.egg-info
end end
# Execute setup.py egg_info using the chosen Python interpreter # 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 end
pushd $ANSIBLE_HOME pushd $ANSIBLE_HOME
if $QUIET if test -n "$QUIET"
# Run gen_egg_info in the background and redirect output to /dev/null # Run gen_egg_info in the background and redirect output to /dev/null
gen_egg_info &> /dev/null gen_egg_info &> /dev/null
# Remove any .pyc files found # Remove any .pyc files found

Loading…
Cancel
Save