On 12/18/2016 9:20 PM, Tom Eastep wrote:
> On 12/12/2016 11:34 AM, Matt Darfeuille wrote:
>> Tom, some minor corrections(code.patch).
>
>
> Applied.
>
> Thanks Matt. Although, it might have been better to simply remove the
> incorrect assignments of 'file' since the variable doesn't appear to
> be used again after those assignments.
>
Indeed, it makes more sense that way!
code1.patch will address it!
Happy holidays and thanks for Shorewall!
-Matt
--
Matt Darfeuille
From 34a547c2726851ecc27031cdb93370ae320db92f Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:12:37 +0100
Subject: [PATCH 01/10] core: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/install.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index b62b82b..2443f35 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -149,13 +149,10 @@ done
if [ $# -eq 0 ]; then
if [ -f ./shorewallrc ]; then
. ./shorewallrc
- file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
- file=/usr/share/shorewall/shorewallrc
else
fatal_error "No configuration file specified and
/usr/share/shorewall/shorewallrc not found"
fi
--
2.8.3
From e74bca51d84cfc5335adae00a017b1a3d87517d1 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:18:16 +0100
Subject: [PATCH 02/10] core: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/uninstall.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall-core/uninstall.sh b/Shorewall-core/uninstall.sh
index bd4f6be..d55093d 100755
--- a/Shorewall-core/uninstall.sh
+++ b/Shorewall-core/uninstall.sh
@@ -81,7 +81,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 32402979115847b8cea2aa90acaed7eb2c35ef9d Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:24:49 +0100
Subject: [PATCH 03/10] shorewall: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall/install.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index d7d199b..76d21bb 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -175,7 +175,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 44d3b3cb823b6d07a45464502cbab40b85fbf8b2 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:29:17 +0100
Subject: [PATCH 04/10] shorewall: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall/uninstall.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index dce83cd..37f4e26 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -128,7 +128,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From a9610e112ceaadb98be88eda69956c8582020cb5 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:32:28 +0100
Subject: [PATCH 05/10] shorewall6: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall6/uninstall.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index cd30d75..4c8b39c 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@@ -127,7 +127,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 3793b30fc420b100e581559e536e238428ccba32 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:35:23 +0100
Subject: [PATCH 06/10] lite: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-lite/install.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 4cdb59d..350d438 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -169,10 +169,8 @@ done
if [ $# -eq 0 ]; then
if [ -f ./shorewallrc ]; then
. ./shorewallrc || exit 1
- 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 512df38cfc211d63f21df6a32cb695a0044a6f32 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:38:05 +0100
Subject: [PATCH 07/10] lite: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-lite/uninstall.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index f8b631c..3553456 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -125,7 +125,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 7c4b836361752ab1f34887b37edecbefbefe9865 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:42:04 +0100
Subject: [PATCH 08/10] lite6: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall6-lite/uninstall.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index 94db120..c47dea2 100755
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-lite/uninstall.sh
@@ -126,7 +126,6 @@ if [ $# -eq 0 ]; then
. ./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
elif [ -f /usr/share/shorewall/shorewallrc ]; then
. /usr/share/shorewall/shorewallrc
else
--
2.8.3
From 63507ee34e7a3404045875483fd1ed13a939b2ce Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:51:30 +0100
Subject: [PATCH 09/10] init: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/install.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 0339053..39e3dac 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -164,10 +164,8 @@ if [ $# -eq 0 ]; then
#
if [ -f ./shorewallrc ]; then
. ./shorewallrc || exit 1
- file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- file=~/.shorewallrc
else
fatal_error "No configuration file specified and ~/.shorewallrc not
found"
fi
--
2.8.3
From ecca3239cecad26a56b6bc90f88b0f87fbae7e25 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Mon, 19 Dec 2016 08:56:41 +0100
Subject: [PATCH 10/10] init: Don't set the 'file' var needlessly
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/uninstall.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 5a7ca18..f8c2608 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -124,10 +124,8 @@ done
if [ $# -eq 0 ]; then
if [ -f ./shorewallrc ]; then
. ./shorewallrc
- file=./shorewallrc
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1
- 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
