From 749e239d152fa2bc92b9b5a29f469a0f1c79f05a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 1 Oct 2012 06:51:36 -0700
Subject: [PATCH] Expunge the g_libexec variable

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/lib.base         | 1 -
 Shorewall-core/lib.cli          | 5 ++---
 Shorewall-lite/shorecap         | 1 -
 Shorewall-lite/shorewall-lite   | 1 -
 Shorewall/Perl/getparams        | 1 -
 Shorewall/lib.cli-std           | 4 ++--
 Shorewall/shorewall             | 1 -
 Shorewall6-lite/shorecap        | 1 -
 Shorewall6-lite/shorewall6-lite | 1 -
 Shorewall6/shorewall6           | 1 -
 10 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base
index c093794ff..23bd48db7 100644
--- a/Shorewall-core/lib.base
+++ b/Shorewall-core/lib.base
@@ -38,7 +38,6 @@ if [ -z "$g_readrc" ]; then
     #
     . /usr/share/shorewall/shorewallrc
 
-    g_libexec="$LIBEXECDIR"
     g_sharedir="$SHAREDIR"/$g_program
     g_sbindir="$SBINDIR"
     g_perllib="$PERLLIBDIR"
diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 058c5e537..43796cc91 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -30,7 +30,6 @@ if [ -z "$g_readrc" ]; then
     #
     . /usr/share/shorewall/shorewallrc
 
-    g_libexec="$LIBEXECDIR"
     g_sharedir="$SHAREDIR"/$g_program
     g_sbindir="$SBINDIR"
     g_perllib="$PERLLIBDIR"
@@ -886,14 +885,14 @@ show_command() {
 	    if [ -n "$g_filemode" ]; then
 		echo "CONFIG_PATH=$CONFIG_PATH"
 		echo "VARDIR=$VARDIR"
-		echo "LIBEXEC=$g_libexec"
+		echo "LIBEXEC=${LIBEXECDIR}"
 		echo "SBINDIR=$g_sbindir"
 		echo "CONFDIR=${CONFDIR}"
 		[ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR=${VARDIR}"
 	    else
 		echo "Default CONFIG_PATH is $CONFIG_PATH"
 		echo "Default VARDIR is /var/lib/$g_program"
-		echo "LIBEXEC is $g_libexec"
+		echo "LIBEXEC is ${LIBEXECDIR}"
 		echo "SBINDIR is $g_sbindir"
 		echo "CONFDIR is ${CONFDIR}"
 		[ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR is ${VARDIR}"
diff --git a/Shorewall-lite/shorecap b/Shorewall-lite/shorecap
index e68aa236f..dc1899078 100755
--- a/Shorewall-lite/shorecap
+++ b/Shorewall-lite/shorecap
@@ -53,7 +53,6 @@ g_program=shorewall-lite
 #
 . /usr/share/shorewall/shorewallrc
 
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall-lite
 g_sbindir="$SBINDIR"
 g_confdir="$CONFDIR"/shorewall-lite
diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite
index 62ec33163..28d9f0fcd 100755
--- a/Shorewall-lite/shorewall-lite
+++ b/Shorewall-lite/shorewall-lite
@@ -33,7 +33,6 @@ PRODUCT=shorewall-lite
 . /usr/share/shorewall/shorewallrc
 
 g_program=$PRODUCT
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall-lite
 g_sbindir="$SBINDIR"
 g_confdir="$CONFDIR"/shorewall-lite
diff --git a/Shorewall/Perl/getparams b/Shorewall/Perl/getparams
index 89328355d..6c0f39d05 100755
--- a/Shorewall/Perl/getparams
+++ b/Shorewall/Perl/getparams
@@ -39,7 +39,6 @@ fi
 . /usr/share/shorewall/shorewallrc
 
 g_program=$PRODUCT
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR/shorewall"
 g_sbindir="$SBINDIR"
 g_perllib="$PERLLIBDIR"
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index b7300cbe7..979bae4d6 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -363,7 +363,7 @@ compiler() {
     local shorewallrc
     local shorewallrc1
 
-    pc=$g_libexec/shorewall/compiler.pl
+    pc=${LIBEXECDIR}/shorewall/compiler.pl
 
     if [ $(id -u) -ne 0 ]; then
 	if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = /etc/$g_program ]; then
@@ -430,7 +430,7 @@ compiler() {
 	PERL=/usr/bin/perl
     fi
 
-    if [ $g_perllib = ${g_libexec}/shorewall ]; then
+    if [ $g_perllib = ${LIBEXECDIR}/shorewall ]; then
 	$PERL $debugflags $pc $options $@
     else
 	PERL5LIB=$g_perllib
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 5af1b9f9e..f06b7d8ea 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -33,7 +33,6 @@ PRODUCT=shorewall
 . /usr/share/shorewall/shorewallrc
 
 g_program=$PRODUCT
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall
 g_sbindir="$SBINDIR"
 g_perllib="$PERLLIBDIR"
diff --git a/Shorewall6-lite/shorecap b/Shorewall6-lite/shorecap
index 22d0ad05c..6b3656f57 100755
--- a/Shorewall6-lite/shorecap
+++ b/Shorewall6-lite/shorecap
@@ -52,7 +52,6 @@ g_program=shorewall6-lite
 #
 . /usr/share/shorewall/shorewallrc
 
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall6-lite
 g_sbindir="$SBINDIR"
 g_confdir="$CONFDIR"/shorewall6-lite
diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite
index 6a5eae14a..5e9bfd895 100755
--- a/Shorewall6-lite/shorewall6-lite
+++ b/Shorewall6-lite/shorewall6-lite
@@ -33,7 +33,6 @@ PRODUCT=shorewall6-lite
 . /usr/share/shorewall/shorewallrc
 
 g_program=$PRODUCT
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall6-lite
 g_sbindir="$SBINDIR"
 g_confdir="$CONFDIR"/shorewall6-lite
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 362abdd46..7cdd271f5 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -33,7 +33,6 @@ PRODUCT=shorewall6
 . /usr/share/shorewall/shorewallrc
 
 g_program=$PRODUCT
-g_libexec="$LIBEXECDIR"
 g_sharedir="$SHAREDIR"/shorewall6
 g_sbindir="$SBINDIR"
 g_perllib="$PERLLIBDIR"