From 51d7faf7c3b259d505845661b3831437bba83b80 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 17 Jan 2006 17:34:34 +0000
Subject: [PATCH] More cleanup

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3308 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall  | 6 +++---
 Shorewall/shorewall | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 5579d6250..7aa06292a 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -48,7 +48,7 @@
 #		      not specify "nolock" on the runline.
 #
 my_mutex_on() {
-    [ -n "$nolock" ] || { mutex_on; HAVE_MUTEX=Yes; }
+    [ -n "$NOLOCK" ] || { mutex_on; HAVE_MUTEX=Yes; }
 }
 
 my_mutex_off() {
@@ -10199,9 +10199,9 @@ usage() {
 #
 [ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
 
-nolock=
+NOLOCK=
 
-[ $# -gt 1 ] && [ "$1" = "nolock" ] && { nolock=Yes; shift ; }
+[ $# -gt 1 ] && [ "$1" = "nolock" ] && { NOLOCK=Yes; shift ; }
 
 trap "my_mutex_off; exit 2" 1 2 3 4 5 6 9
 
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 608fb548d..949c240ad 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -980,7 +980,7 @@ case "$1" in
 	[ -n "$nolock" ] || mutex_on
 
 	if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile /var/lib/shorewall/.reload; then
-	   $0  nolock $(make_quiet) restore .reload
+	   $0 nolock $(make_quiet) restore .reload
 	fi
 
 	[ -n "$nolock" ] || mutex_off
@@ -1105,7 +1105,7 @@ case "$1" in
 
 	if [ -f /var/lib/shorewall/state ]; then
 	    state="$(cat /var/lib/shorewall/state)"
-	    case \$state in
+	    case $state in
 		Stopped*|Clear*)
 		    status=3
 		    ;;