From 2b9cb739b3052af8927d5c56ea02593a64b012fc Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 8 Jul 2007 17:46:38 +0000
Subject: [PATCH] Make install.sh re-runnable

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6809 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/configpath | 15 ---------------
 Shorewall-common/install.sh |  6 ++----
 Shorewall-common/lib.cli    |  2 +-
 Shorewall-common/shorewall  |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Shorewall-common/configpath b/Shorewall-common/configpath
index 0c194d93e..3e62b3e29 100644
--- a/Shorewall-common/configpath
+++ b/Shorewall-common/configpath
@@ -11,18 +11,3 @@
 #	from trying to use configuration information from /etc/shorewall.
 
 CONFIG_PATH=${CONFDIR}:/usr/share/shorewall
-
-#
-# SHOREWALL LITE'S FIREWALL SCRIPT DIRECTORY
-#
-# There is lack of agreement about where exactly in the file hierarchy the
-# firewall script in Shorewall Lite systems should be stored. To allow
-# everyone's opinion to prevail (and to prevent the Shorewall author from
-# going crazy), the LITEDIR option allows you to decide where the file will
-# be stored on Shorewall Lite systems under your distribution.
-#
-# a) You *must* set a value for this option
-# b) The same value must be configured in
-#    /usr/share/shorewall-lite/configpath in your Shorewall Lite package.
-
-LITEDIR=/var/lib/shorewall-lite
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index e7c709f66..bf9d90260 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -683,16 +683,14 @@ fi
 
 cd manpages
 
-rm -f *.gz
-
 for f in *.5; do
-    gzip $f
+    gzip -c $f > $f.gz
     run_install -D  -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
     echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
 done
 
 for f in *.8; do
-    gzip $f
+    gzip -c $f > $f.gz
     run_install -D  -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
     echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
 done
diff --git a/Shorewall-common/lib.cli b/Shorewall-common/lib.cli
index 156b4a68b..819e6d5ef 100644
--- a/Shorewall-common/lib.cli
+++ b/Shorewall-common/lib.cli
@@ -541,7 +541,7 @@ show_command() {
 	config)
 	    . ${SHAREDIR}/configpath
 	    echo "Default CONFIG_PATH is $CONFIG_PATH"
-	    echo "LITEDIR is $LITEDIR"
+	    [ -n "$LITEDIR" ] && echo "LITEDIR is $LITEDIR"
 	    ;;
 	chain)
 	    shift
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index b5d83e2fd..6665f0c05 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -1102,7 +1102,7 @@ reload_command() # $* = original arguments less the command.
 {
     local verbose=$(make_verbose) file= capabilities= finished=0 saveit= result directory system getcaps= root=root compiler=
 
-    [ -n "$LITEDIR" ] || fatal_error "ERROR: LITEDIR not defined in ${SHAREDIR}/configpath"
+    LITEDIR=/var/lib/shorewall-lite
 
     while [ $finished -eq 0 -a $# -gt 0 ]; do
 	option=$1