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

set -e doesn't like [ blah ] && blah syntax

Browse source 
changed to if [ blah ]; then blah; fi format
migrated echo usage to cat with HEREDOC to improve readability
This commit is contained in:
Jake Guffey 2012-09-19 17:27:40 -04:00
commit d77c67b56f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
conf/type/__pf_ruleset/gencode-remote
View file

@ -36,6 +36,12 @@ fi
rcvar=$(cat "$__object/explorer/rcvar") rcvar=$(cat "$__object/explorer/rcvar")
# --state absent, so ensure that .new doesn't exist and that conf is renamed to .old # --state absent, so ensure that .new doesn't exist and that conf is renamed to .old
echo "[ -f \"${rcvar}.new\" ] && rm \"${rcvar}.new\"" cat <<EOF
echo "[ -f \"${rcvar}\" ] && mv \"${rcvar}\" \"${rcvar}.old\"" if [ -f "${rcvar}.new" ]; then
rm "${rcvar}.new"
fi
if [ -f "${rcvar}" ]; then
mv "${rcvar}" "${rcvar}.old"
fi
EOF