From 9c0ad6d49518bc5f418c38ca04cd659be3e00c7a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 9 Oct 2002 15:05:53 +0000
Subject: [PATCH] Fix typo in firewall script (recalculate_interfacess) Add
 PATH assignment to the install script Correct 'functions' file handling in
 the install script

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

diff --git a/Shorewall/firewall b/Shorewall/firewall
index ca68cffb1..2d77baa7d 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -480,7 +480,7 @@ determine_hosts() {
 	    # Zone is defined in terms of hosts -- derive the interface list
 	    # from the host list
 	    #
-	    recalculate_interfacess
+	    recalculate_interface
 	else
 	    ####################################################################
 	    # If no hosts are defined for a zone then the zone consists of any
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 6dd828f79..04b054260 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -166,6 +166,8 @@ while [ $# -gt 0 ] ; do
     shift
     ARGS="yes"
 done
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
     
 #
 # Determine where to install the firewall script
@@ -282,13 +284,18 @@ fi
 # Install the functions file
 #
 if [ -f ${PREFIX}/etc/shorewall/functions ]; then
+    backup_file ${PREFIX}/etc/shorewall/functions
+    rm -f  ${PREFIX}/etc/shorewall/functions
+fi
+    
+if [ -f ${PREFIX}/var/lib/shorewall/functions ]; then
     backup_file ${PREFIX}/var/lib/shorewall/functions
     rm -f  ${PREFIX}/var/lib/shorewall/functions
 fi
     
 install_file_with_backup functions ${PREFIX}/usr/lib/shorewall/functions 0444
 
-echo -e "\nCommon functions installed in ${PREFIX}/var/lib/shorewall/functions"
+echo -e "\nCommon functions installed in ${PREFIX}/usr/lib/shorewall/functions"
 #
 # Install the common.def file
 #
diff --git a/Shorewall/zones b/Shorewall/zones
index 6d5add70c..45f103b73 100644
--- a/Shorewall/zones
+++ b/Shorewall/zones
@@ -3,7 +3,7 @@
 #
 # This file determines your network zones. Columns are:
 #
-#	ZONE		Short name of the zone
+#	ZONE		Short name of the zone 
 #	DISPLAY		Display name of the zone
 #	COMMENTS	Comments about the zone
 #