mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-21 23:23:13 +01:00
Correct typo
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
8a164adf98
commit
e641bf7ac2
@ -42,8 +42,8 @@ if [ -z "$g_readrc" ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif [ -f ~/.shorewallrc ]; then
|
||||
. ~/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
SHAREDIR=/usr/share
|
||||
CONFDIR=/etc
|
||||
|
@ -33,8 +33,8 @@ if [ -z "$g_readrc" ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif [ -r /.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
SHAREDIR=/usr/share
|
||||
CONFDIR=${CONFDIR}
|
||||
|
@ -31,8 +31,8 @@ elif [ -r /root/.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif [ -r /.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
VARDIR=/var/lib
|
||||
LIBEXECDIR=/usr/share
|
||||
|
@ -35,8 +35,8 @@ elif [ -r /root/.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif [ -r /.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
SHAREDIR=/usr/share
|
||||
CONFDIR=${CONFDIR}
|
||||
|
@ -101,7 +101,10 @@ else
|
||||
VARDIR=/var/lib
|
||||
fi
|
||||
|
||||
[ -n "$TMPDIR" ] && export TMPDIR
|
||||
if [ -n "$TEMPDIR" ]; then
|
||||
TMPDIR="$TEMPDIR"
|
||||
export TMPDIR
|
||||
fi
|
||||
|
||||
initialize
|
||||
|
||||
|
@ -36,7 +36,7 @@ elif [ -r /root/.shorewallrc ]; then
|
||||
elif [ -r /.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
SHAREDIR=/usr/share
|
||||
CONFDIR=${CONFDIR}
|
||||
|
@ -27,8 +27,16 @@
|
||||
################################################################################################
|
||||
g_program=shorewall6-lite
|
||||
|
||||
if [ -f ~/.shorewallrc ]; then
|
||||
if [ -f ./.shorewallrc ]; then
|
||||
. ./.shorewallrc || exit 1
|
||||
elif [ -f ~/.shorewallrc ]; then
|
||||
. ~/.shorewallrc || exit 1
|
||||
elif [ -r /root/.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif [ -r /.shorewallrc ]; then
|
||||
. /root/.shorewallrc || exit 1
|
||||
elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
|
||||
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
|
||||
else
|
||||
SHAREDIR=/usr/share
|
||||
CONFDIR=${CONFDIR}
|
||||
|
Loading…
Reference in New Issue
Block a user