From 8cc91bf428265ea552cd6df95968543a0e531bc6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 17 Jan 2006 17:00:54 +0000
Subject: [PATCH] A couple of minor tweaks

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

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 9b0472964..bed29a459 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -63,6 +63,7 @@ fatal_error() # $* = Error Message
     echo "   ERROR: $@" >&2
     if [ $COMMAND = check -o $COMMAND = compile ]; then
 	[ -n "$TMP_DIR" ] && rm -rf $TMP_DIR
+	[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE
     else
 	stop_firewall
     fi
@@ -9958,7 +9959,7 @@ do_initialize() {
     [ -n "$TMP_DIR" ] && chmod 700 $TMP_DIR || \
        startup_error "Can't create a temporary directory"
 
-    trap "rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9
+    trap "[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE;rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9
 
     ensure_config_path
 
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 632338da3..5a0d562bb 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -629,9 +629,9 @@ NOROUTES=
 EXPORT=
 noroutes=
 
-done=0
+finished=0
 
-while [ $done -eq 0 ]; do
+while [ $finished -eq 0 ]; do
     [ $# -eq 0 ] && usage 1
     option=$1
     case $option in
@@ -681,6 +681,10 @@ while [ $done -eq 0 ]; do
 			NOROUTES=Yes
 			option=${option#n}
 			;;
+		    -)
+			finished=1
+			option=
+			;;
 		    *)
 			usage 1
 			;;
@@ -689,7 +693,7 @@ while [ $done -eq 0 ]; do
 	    shift
 	    ;;
 	*)
-	    done=1
+	    finished=1
             ;;
     esac
 done
@@ -846,9 +850,9 @@ case "$1" in
     compile|generate)
 	shift
 
-	done=0
+	finished=0
 
-	while [ $done -eq 0 ]; do
+	while [ $finished -eq 0 ]; do
 	    [ $# -eq 0 ] && usage 1
 	    option=$1
 	    case $option in
@@ -871,6 +875,10 @@ case "$1" in
 				export PROGRAM=Yes
 				option=${option#p}
 				;;
+			    -)
+				finished=1
+				option=
+				;;
 			    *)
 				usage 1
 				;;
@@ -879,7 +887,7 @@ case "$1" in
 		    shift
 		    ;;
 		*)
-		    done=1
+		    finished=1
 		    ;;
 	    esac
 	done