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

More quotes and reimplement without pushd/popd

Browse source
This commit is contained in:
Toshio Kuratomi 2015-01-18 08:16:55 -08:00
parent ed891c76f6
commit 365af69c3e
2 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
hacking/env-setup
View file

@ -36,31 +36,28 @@ expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || export MANPATH="$PREFIX_M
gen_egg_info()
{
python setup.py egg_info
if [ -e $PREFIX_PYTHONPATH/ansible*.egg-info ] ; then
rm -r $PREFIX_PYTHONPATH/ansible*.egg-info
if [ -e "$PREFIX_PYTHONPATH/ansible*.egg-info" ] ; then
rm -r "$PREFIX_PYTHONPATH/ansible*.egg-info"
fi
mv ansible*.egg-info $PREFIX_PYTHONPATH
mv "ansible*.egg-info" "$PREFIX_PYTHONPATH"
}
# In some shells if pushd is a no-op then popd sends you to a previous
# directory in history
if [ "$ANSIBLE_HOME" != "$PWD" ] ; then
pushd "$ANSIBLE_HOME"
if [ "$VERBOSITY" = "-q" ] ; then
gen_egg_info 2>1 1> /dev/null
else
gen_egg_info
fi
popd
current_dir="$PWD"
else
if [ "$VERBOSITY" = "-q" ] ; then
gen_egg_info 2>1 1> /dev/null
else
gen_egg_info
fi
current_dir="$ANSIBLE_HOME"
fi
cd "$ANSIBLE_HOME"
if [ "$VERBOSITY" = "-q" ] ; then
gen_egg_info 2>1 1> /dev/null
else
gen_egg_info
fi
cd "$current_dir"
#
# Print out values unless -q is set
#
if [ "$VERBOSITY" != "-q" ] ; then
echo ""

33
v2/hacking/env-setup
View file

@ -36,31 +36,28 @@ expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || export MANPATH="$PREFIX_M
gen_egg_info()
{
python setup.py egg_info
if [ -e $PREFIX_PYTHONPATH/ansible*.egg-info ] ; then
rm -r $PREFIX_PYTHONPATH/ansible*.egg-info
if [ -e "$PREFIX_PYTHONPATH/ansible*.egg-info" ] ; then
rm -r "$PREFIX_PYTHONPATH/ansible*.egg-info"
fi
mv ansible*.egg-info $PREFIX_PYTHONPATH
mv "ansible*.egg-info" "$PREFIX_PYTHONPATH"
}
# In some shells if pushd is a no-op then popd sends you to a previous
# directory in history
#if [ "$ANSIBLE_HOME" != "$PWD" ] ; then
# pushd "$ANSIBLE_HOME"
# if [ "$VERBOSITY" = "-q" ] ; then
# gen_egg_info 2>1 1> /dev/null
# else
# gen_egg_info
# fi
# popd
if [ "$ANSIBLE_HOME" != "$PWD" ] ; then
current_dir="$PWD"
else
current_dir="$ANSIBLE_HOME"
fi
cd "$ANSIBLE_HOME"
#if [ "$VERBOSITY" = "-q" ] ; then
# gen_egg_info 2>1 1> /dev/null
#else
# if [ "$VERBOSITY" = "-q" ] ; then
# gen_egg_info 2>1 1> /dev/null
# else
# gen_egg_info
# fi
# gen_egg_info
#fi
cd "$current_dir"
#
# Print out values unless -q is set
#
if [ "$VERBOSITY" != "-q" ] ; then
echo ""