Tom, some minor corrections(code.patch).
-Matt
--
Matt Darfeuille
From ea83f7a08c942773cbea4b3eb0ad518c05ba7996 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 13:05:10 +0100
Subject: [PATCH 01/12] shorewall: Correct displaying of shorewall version
Add the Product name variable to properly display the product name
when the '-v' option is passed to the script.
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall/uninstall.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 74b92b9..223921f 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -28,6 +28,7 @@
VERSION=xxx #The Build script inserts the actual version
PRODUCT=shorewall
+Product=Shorewall
usage() # $1 = exit status
{
--
2.8.3
From 58c248c7c2fe6dd748d4de679a6207012cb6e9e3 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 13:36:25 +0100
Subject: [PATCH 02/12] core: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-core/uninstall.sh b/Shorewall-core/uninstall.sh
index 3fc3f0c..bd4f6be 100755
--- a/Shorewall-core/uninstall.sh
+++ b/Shorewall-core/uninstall.sh
@@ -81,7 +81,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 4858bc408068c71990a03273b813b188f1921995 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 16:29:08 +0100
Subject: [PATCH 03/12] shorewall: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index dc312be..d7d199b 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -175,7 +175,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From f17b94ffe1ecdbdc7afb64fbe6fcc0432b8620a6 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 16:34:13 +0100
Subject: [PATCH 04/12] shorewall: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 223921f..6e11f39 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -128,7 +128,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 29f66c6ed970e697fc86cafab602796ccc8053c1 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 16:38:38 +0100
Subject: [PATCH 05/12] shorewall6: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall6/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index 386c12b..5dda871 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@@ -127,7 +127,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From f4f4c5d150fd07b66b45f627296ce6ed6e8c4d88 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 16:55:43 +0100
Subject: [PATCH 06/12] lite: Add 'file' var and set path of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-lite/install.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index ec4338b..4cdb59d 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -172,6 +172,7 @@ if [ $# -eq 0 ]; then
file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From bd807ea2e874e56f00dc01e4a0b30b3e2363bf6a Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:06:48 +0100
Subject: [PATCH 07/12] lite: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-lite/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 60ef91c..536a5fc 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -125,7 +125,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 84e99ad1549017a1a46790c787e0e2fe3f52ddc2 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:16:12 +0100
Subject: [PATCH 08/12] lite6: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall6-lite/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index 609c087..4dd94c7 100755
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-lite/uninstall.sh
@@ -126,7 +126,7 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 59bb9f080bb769a0aa21885e2c60fccdaddc0600 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:24:59 +0100
Subject: [PATCH 09/12] init: Correct the filepath of shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index d0aaf10..817e124 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -164,7 +164,7 @@ if [ $# -eq 0 ]; then
#
if [ -f ./shorewallrc ]; then
. ./shorewallrc || exit 1
- file=~/.shorewallrc
+ file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
file=./.shorewallrc
--
2.8.3
From 19df7232e15785c144fb5666299dbea7dc1b80dc Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:28:40 +0100
Subject: [PATCH 10/12] init: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 817e124..4749c02 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -167,7 +167,7 @@ if [ $# -eq 0 ]; then
file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
else
fatal_error "No configuration file specified and ~/.shorewallrc not
found"
fi
--
2.8.3
From 1a565ab93f74e0711230362d8a47581efbb993b7 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:37:42 +0100
Subject: [PATCH 11/12] init: Add 'file' var and set path of shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/uninstall.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 01a1a75..86ffadf 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -124,6 +124,7 @@ done
if [ $# -eq 0 ]; then
if [ -f ./shorewallrc ]; then
. ./shorewallrc
+ file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
file=./.shorewallrc
--
2.8.3
From 74263ed6645449be49702fe50c8975dbb91132a4 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 12 Dec 2016 17:40:52 +0100
Subject: [PATCH 12/12] init: Correct the filepath of .shorewallrc
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 86ffadf..5a7ca18 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -127,7 +127,7 @@ if [ $# -eq 0 ]; then
file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=./.shorewallrc
+ file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
