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

@@ -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
 {

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

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
 {