Make -q flag totally quiet for env-setup.fish

The first echo and setup.py steps are not quiet and result in output that is annoying if your Fish is configured to source the file.
This commit is contained in:
Brett Inman 2016-04-27 11:34:51 -07:00 committed by Toshio Kuratomi
parent 430bef907a
commit 8222a83bcd

View file

@ -8,6 +8,15 @@ set PREFIX_PYTHONPATH $ANSIBLE_HOME/lib
set PREFIX_PATH $ANSIBLE_HOME/bin
set PREFIX_MANPATH $ANSIBLE_HOME/docs/man
# set quiet flag
if set -q argv
switch $argv
case '-q' '--quiet'
set QUIET "true"
case '*'
end
end
# Set PYTHONPATH
if not set -q PYTHONPATH
set -gx PYTHONPATH $PREFIX_PYTHONPATH
@ -15,7 +24,9 @@ else
switch PYTHONPATH
case "$PREFIX_PYTHONPATH*"
case "*"
if not [ $QUIET ]
echo "Appending PYTHONPATH"
end
set -gx PYTHONPATH "$PREFIX_PYTHONPATH:$PYTHONPATH"
end
end
@ -38,7 +49,11 @@ set -gx ANSIBLE_LIBRARY $ANSIBLE_HOME/library
# Generate egg_info so that pkg_resources works
pushd $ANSIBLE_HOME
python setup.py egg_info
if [ $QUIET ]
python setup.py -q egg_info
else
python setup.py egg_info
end
if test -e $PREFIX_PYTHONPATH/ansible*.egg-info
rm -r $PREFIX_PYTHONPATH/ansible*.egg-info
end
@ -47,10 +62,7 @@ find . -type f -name "*.pyc" -delete
popd
if set -q argv
switch $argv
case '-q' '--quiet'
case '*'
if not [ $QUIET ]
echo ""
echo "Setting up Ansible to run out of checkout..."
echo ""
@ -59,10 +71,10 @@ if set -q argv
echo "ANSIBLE_LIBRARY=$ANSIBLE_LIBRARY"
echo "MANPATH=$MANPATH"
echo ""
echo "Remember, you may wish to specify your host file with -i"
echo ""
echo "Done!"
echo ""
end
end
set -e QUIET