From d77c67b56f95789c731bd6827ee480dfedcf793f Mon Sep 17 00:00:00 2001
From: Jake Guffey <jake.guffey@eprotex.com>
Date: Wed, 19 Sep 2012 17:27:40 -0400
Subject: [PATCH] set -e doesn't like [ blah ] && blah syntax

changed to if [ blah ]; then blah; fi format
migrated echo usage to cat with HEREDOC to improve readability
---
 conf/type/__pf_ruleset/gencode-remote | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/conf/type/__pf_ruleset/gencode-remote b/conf/type/__pf_ruleset/gencode-remote
index 4018bbd7..e5eece64 100644
--- a/conf/type/__pf_ruleset/gencode-remote
+++ b/conf/type/__pf_ruleset/gencode-remote
@@ -36,6 +36,12 @@ fi
 rcvar=$(cat "$__object/explorer/rcvar")
 
 # --state absent, so ensure that .new doesn't exist and that conf is renamed to .old
-echo "[ -f \"${rcvar}.new\" ] && rm \"${rcvar}.new\""
-echo "[ -f \"${rcvar}\" ] && mv \"${rcvar}\" \"${rcvar}.old\""
+cat <<EOF
+if [ -f "${rcvar}.new" ]; then
+   rm "${rcvar}.new"
+fi
+if [ -f "${rcvar}" ]; then
+   mv "${rcvar}" "${rcvar}.old"
+fi
+EOF