extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 06:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expunge the g_sbindir variable

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-10-01 06:55:48 -07:00
parent 749e239d15
commit a8e9296473
9 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/lib.base
View File

@ -39,7 +39,6 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc . /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/$g_program g_sharedir="$SHAREDIR"/$g_program
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR" g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/$g_program g_confdir="$CONFDIR"/$g_program
g_readrc=1 g_readrc=1

5
Shorewall-core/lib.cli
View File

@ -31,7 +31,6 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc . /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/$g_program g_sharedir="$SHAREDIR"/$g_program
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR" g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/$g_program g_confdir="$CONFDIR"/$g_program
g_readrc=1 g_readrc=1
@ -886,14 +885,14 @@ show_command() {
echo "CONFIG_PATH=$CONFIG_PATH" echo "CONFIG_PATH=$CONFIG_PATH"
echo "VARDIR=$VARDIR" echo "VARDIR=$VARDIR"
echo "LIBEXEC=${LIBEXECDIR}" echo "LIBEXEC=${LIBEXECDIR}"
echo "SBINDIR=$g_sbindir" echo "SBINDIR=${SBINDIR}"
echo "CONFDIR=${CONFDIR}" echo "CONFDIR=${CONFDIR}"
[ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR=${VARDIR}" [ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR=${VARDIR}"
else else
echo "Default CONFIG_PATH is $CONFIG_PATH" echo "Default CONFIG_PATH is $CONFIG_PATH"
echo "Default VARDIR is /var/lib/$g_program" echo "Default VARDIR is /var/lib/$g_program"
echo "LIBEXEC is ${LIBEXECDIR}" echo "LIBEXEC is ${LIBEXECDIR}"
echo "SBINDIR is $g_sbindir" echo "SBINDIR is ${SBINDIR}"
echo "CONFDIR is ${CONFDIR}" echo "CONFDIR is ${CONFDIR}"
[ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR is ${VARDIR}" [ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR is ${VARDIR}"
fi fi

1
Shorewall-lite/shorecap
View File

@ -54,7 +54,6 @@ g_program=shorewall-lite
. /usr/share/shorewall/shorewallrc . /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/shorewall-lite g_sharedir="$SHAREDIR"/shorewall-lite
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"/shorewall-lite g_confdir="$CONFDIR"/shorewall-lite
g_readrc=1 g_readrc=1

1
Shorewall-lite/shorewall-lite
View File

@ -34,7 +34,6 @@ PRODUCT=shorewall-lite
g_program=$PRODUCT g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall-lite g_sharedir="$SHAREDIR"/shorewall-lite
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"/shorewall-lite g_confdir="$CONFDIR"/shorewall-lite
g_readrc=1 g_readrc=1

1
Shorewall/Perl/getparams
View File

@ -40,7 +40,6 @@ fi
g_program=$PRODUCT g_program=$PRODUCT
g_sharedir="$SHAREDIR/shorewall" g_sharedir="$SHAREDIR/shorewall"
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR" g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR/$PRODUCT" g_confdir="$CONFDIR/$PRODUCT"
g_readrc=1 g_readrc=1

1
Shorewall/shorewall
View File

@ -34,7 +34,6 @@ PRODUCT=shorewall
g_program=$PRODUCT g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall g_sharedir="$SHAREDIR"/shorewall
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR" g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/shorewall g_confdir="$CONFDIR"/shorewall
g_readrc=1 g_readrc=1

1
Shorewall6-lite/shorecap
View File

@ -53,7 +53,6 @@ g_program=shorewall6-lite
. /usr/share/shorewall/shorewallrc . /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/shorewall6-lite g_sharedir="$SHAREDIR"/shorewall6-lite
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"/shorewall6-lite g_confdir="$CONFDIR"/shorewall6-lite
g_readrc=1 g_readrc=1

1
Shorewall6-lite/shorewall6-lite
View File

@ -34,7 +34,6 @@ PRODUCT=shorewall6-lite
g_program=$PRODUCT g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall6-lite g_sharedir="$SHAREDIR"/shorewall6-lite
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"/shorewall6-lite g_confdir="$CONFDIR"/shorewall6-lite
g_readrc=1 g_readrc=1

1
Shorewall6/shorewall6
View File

@ -34,7 +34,6 @@ PRODUCT=shorewall6
g_program=$PRODUCT g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall6 g_sharedir="$SHAREDIR"/shorewall6
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR" g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/shorewall6 g_confdir="$CONFDIR"/shorewall6
g_readrc=1 g_readrc=1