From 2b6d22c40d1e0c0f28799e2bedc576ff015a6f31 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 7 Oct 2005 15:46:38 +0000
Subject: [PATCH] Suppress 'save' operations during refresh

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2823 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/fallback.sh |  2 +-
 Shorewall/firewall    | 12 +++++++-----
 Shorewall/install.sh  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index 57fd100e5..2f2fccfe2 100755
--- a/Shorewall/fallback.sh
+++ b/Shorewall/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.5.7
+VERSION=2.5.8
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/firewall b/Shorewall/firewall
index a332df4ef..188d5fcd7 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -112,9 +112,11 @@ save_command()
 #
 save_progress_message()
 {
-    echo                           >> $RESTOREBASE
-    echo "progress_message \"$@\"" >> $RESTOREBASE
-    echo                           >> $RESTOREBASE
+    if [ $COMMAND != refresh ]; then
+	echo                           >> $RESTOREBASE
+	echo "progress_message \"$@\"" >> $RESTOREBASE
+	echo                           >> $RESTOREBASE
+    fi
 }
 
 #
@@ -125,7 +127,7 @@ save_progress_message()
 #
 run_and_save_command()
 {
-    echo "$@" >> $RESTOREBASE
+    [ $COMMAND = refresh ] || echo "$@" >> $RESTOREBASE
     eval $*
 }
 
@@ -135,7 +137,7 @@ run_and_save_command()
 ensure_and_save_command()
 {
     if eval $* ; then
-	echo "$@" >> $RESTOREBASE
+	[ $COMMAND = refresh ] || echo "$@" >> $RESTOREBASE
     else
 	[ -z "$STOPPING" ] && { stop_firewall; exit 2; }
     fi
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index ef85debe4..19f0e480f 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=2.5.7
+VERSION=2.5.8
 
 usage() # $1 = exit status
 {