From f48b2e715fc393dee3d62dfa87220e7f6387d82f Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <matdarf@gmail.com>
Date: Mon, 20 Feb 2017 18:51:59 +0100
Subject: [PATCH] Unify the installers

 - Clean up code

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/install.sh | 14 +++++++-------
 Shorewall-init/install.sh | 15 ++++++++-------
 Shorewall-lite/install.sh | 13 +++++++------
 Shorewall/install.sh      | 17 +++++++++--------
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index da9be321d..6bbd7b20c 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -22,17 +22,17 @@
 #	along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION=xxx #The Build script inserts the actual version
-
+VERSION=xxx # The Build script inserts the actual version
 PRODUCT=shorewall-core
 Product="Shorewall Core"
- 
+
 usage() # $1 = exit status
 {
     ME=$(basename $0)
-    echo "usage: $ME [ <configuration-file> ] "
-    echo "       $ME -v"
-    echo "       $ME -h"
+    echo "usage: $ME [ <option> ] [ <shorewallrc file> ]"
+    echo "where <option> is one of"
+    echo "  -h"
+    echo "  -v"
     exit $1
 }
 
@@ -406,6 +406,6 @@ if [ ${SHAREDIR} != /usr/share ]; then
     done
 fi
 #
-#  Report Success
+# Report Success
 #
 echo "$Product Version $VERSION Installed"
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 35248fcdc..57a495bd6 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -27,17 +27,18 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=xxx #The Build script inserts the actual version.
+VERSION=xxx # The Build script inserts the actual version
 PRODUCT=shorewall-init
 Product="Shorewall Init"
 
 usage() # $1 = exit status
 {
     ME=$(basename $0)
-    echo "usage: $ME [ <configuration-file> ]"
-    echo "       $ME -v"
-    echo "       $ME -h"
-    echo "       $ME -n"
+    echo "usage: $ME [ <option> ] [ <shorewallrc file> ]"
+    echo "where <option> is one of"
+    echo "  -h"
+    echo "  -v"
+    echo "  -n"
     exit $1
 }
 
@@ -379,7 +380,7 @@ else
 		# Gentoo does not support if-{up,down}.d
 		/bin/true
 	    elif [ $HOST = openwrt ]; then
-		# Not implemented on openwrt
+		# Not implemented on OpenWRT
 		/bin/true
 	    else
 		make_parent_directory ${DESTDIR}/${ETC}/NetworkManager/dispatcher.d 0755
@@ -573,6 +574,6 @@ if [ -d ${DESTDIR}/etc/ppp ]; then
     esac
 fi
 #
-#  Report Success
+# Report Success
 #
 echo "shorewall Init Version $VERSION Installed"
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 76f8271f6..df3edf32c 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,15 +22,16 @@
 #	along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION=xxx #The Build script inserts the actual version
+VERSION=xxx # The Build script inserts the actual version
 
 usage() # $1 = exit status
 {
     ME=$(basename $0)
-    echo "usage: $ME [ <configuration-file> ]"
-    echo "       $ME -v"
-    echo "       $ME -h"
-    echo "       $ME -n"
+    echo "usage: $ME [ <option> ] [ <shorewallrc file> ]"
+    echo "where <option> is one of"
+    echo "  -h"
+    echo "  -v"
+    echo "  -n"
     exit $1
 }
 
@@ -558,6 +559,6 @@ if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${
 fi
 
 #
-#  Report Success
+# Report Success
 #
 echo "$Product Version $VERSION Installed"
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index a28a8dedc..c2de91930 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -22,17 +22,18 @@
 #	along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION=4.5.5       #The Build script inserts the actual version
+VERSION=xxx # The Build script inserts the actual version
 
 usage() # $1 = exit status
 {
     ME=$(basename $0)
-    echo "usage: $ME [ <configuration-file> ]"
-    echo "       $ME -v"
-    echo "       $ME -h"
-    echo "       $ME -s"
-    echo "       $ME -a"
-    echo "       $ME -n"
+    echo "usage: $ME [ <option> ] [ <shorewallrc file> ]"
+    echo "where <option> is one of"
+    echo "  -h"
+    echo "  -v"
+    echo "  -s"
+    echo "  -a"
+    echo "  -n"
     exit $1
 }
 
@@ -1230,6 +1231,6 @@ if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${
 fi
 
 #
-#  Report Success
+# Report Success
 #
 echo "$Product Version $VERSION Installed"