extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-21 23:23:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expunge the g_libexec variable

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-10-01 06:51:36 -07:00
parent 526ad75c49
commit 749e239d15
10 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/lib.base
View File

@ -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"

5
Shorewall-core/lib.cli
View File

@ -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}"

1
Shorewall-lite/shorecap
View File

@ -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

1
Shorewall-lite/shorewall-lite
View File

@ -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

1
Shorewall/Perl/getparams
View File

@ -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"

4
Shorewall/lib.cli-std
View File

@ -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

1
Shorewall/shorewall
View File

@ -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"

1
Shorewall6-lite/shorecap
View File

@ -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

1
Shorewall6-lite/shorewall6-lite
View File

@ -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

1
Shorewall6/shorewall6
View File

@ -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"