internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15630 from brettinman/devel

Browse Source 
Make -q flag totally quiet for env-setup.fish
This commit is contained in:
Toshio Kuratomi
2016-04-27 12:31:59 -07:00
parent d652b2edc0 1f89a46b52
commit 258d6fcddf
1 changed files with 32 additions and 20 deletions
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