cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
hacking/env-setup.fish
View file

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