From 92d39dc56d25ae764b774b83f1e52eada27b9b9f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 1 Oct 2012 06:59:39 -0700 Subject: [PATCH] Expunge the g_perllib variable Signed-off-by: Tom Eastep --- Shorewall-core/lib.base | 1 - Shorewall-core/lib.cli | 1 - Shorewall/Perl/getparams | 1 - Shorewall/lib.cli-std | 4 ++-- Shorewall/shorewall | 1 - Shorewall6/shorewall6 | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base index b28397554..08005f150 100644 --- a/Shorewall-core/lib.base +++ b/Shorewall-core/lib.base @@ -39,7 +39,6 @@ if [ -z "$g_readrc" ]; then . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/$g_program - g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/$g_program g_readrc=1 fi diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 26332dee6..b999fb254 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -31,7 +31,6 @@ if [ -z "$g_readrc" ]; then . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/$g_program - g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/$g_program g_readrc=1 fi diff --git a/Shorewall/Perl/getparams b/Shorewall/Perl/getparams index 7a276e037..33de4f2b9 100755 --- a/Shorewall/Perl/getparams +++ b/Shorewall/Perl/getparams @@ -40,7 +40,6 @@ fi g_program=$PRODUCT g_sharedir="$SHAREDIR/shorewall" -g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR/$PRODUCT" g_readrc=1 diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 979bae4d6..956a6ce3c 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -430,10 +430,10 @@ compiler() { PERL=/usr/bin/perl fi - if [ $g_perllib = ${LIBEXECDIR}/shorewall ]; then + if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then $PERL $debugflags $pc $options $@ else - PERL5LIB=$g_perllib + PERL5LIB=${PERLLIBDIR} export PERL5LIB $PERL $debugflags $pc $options $@ fi diff --git a/Shorewall/shorewall b/Shorewall/shorewall index bbd666eb6..6d805a413 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -34,7 +34,6 @@ PRODUCT=shorewall g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall -g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/shorewall g_readrc=1 diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 8f3078661..2d2ac3e34 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -34,7 +34,6 @@ PRODUCT=shorewall6 g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall6 -g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/shorewall6 g_readrc=1