sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Migrate conditional syntax

Browse source 
set -e doesn't like [ X ] && Y syntax, migrate to if [ X ]; then Y; fi
This commit is contained in:
Jake Guffey 2012-09-19 17:33:42 -04:00
parent 7a67f8bc16
commit 07c5a9b49e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
conf/type/__pf_apply/gencode-remote
View file

@ -35,11 +35,15 @@ if [ -f "${rcvar}.old" ]; then # rcvar.old exists, we must need to disable pf
# Cleanup # Cleanup
rm -f "${rcvar}.old" rm -f "${rcvar}.old"
# This file shouldn't exist, but just in case... # This file shouldn't exist, but just in case...
[ -f "${rcvar}" ] && rm -f "${rcvar}" if [ -f "${rcvar}" ]; then
rm -f "${rcvar}"
fi
elif [ -f "${rcvar}.new" ]; then # rcvar.new exists, we must need to apply it elif [ -f "${rcvar}.new" ]; then # rcvar.new exists, we must need to apply it
# Ensure that pf is enabled in the first place # Ensure that pf is enabled in the first place
# If it already is enabled, pfctl -e returns 1, go on with life # If it already is enabled, pfctl -e returns 1, go on with life
[ -f "${rcvar}" ] && rm -f "${rcvar}" if [ -f "${rcvar}" ];
rm -f "${rcvar}"
fi
mv "${rcvar}.new" "${rcvar}" mv "${rcvar}.new" "${rcvar}"
pfctl -e || true pfctl -e || true
pfctl -f "${rcvar}" pfctl -f "${rcvar}"