Correct typo

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-26 16:01:35 -07:00
parent 8a164adf98
commit e641bf7ac2
7 changed files with 22 additions and 11 deletions

View File

@ -42,8 +42,8 @@ if [ -z "$g_readrc" ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif [ -f ~/.shorewallrc ]; then elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=/etc CONFDIR=/etc

View File

@ -33,8 +33,8 @@ if [ -z "$g_readrc" ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif [ -r /.shorewallrc ]; then elif [ -r /.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=${CONFDIR}

View File

@ -31,8 +31,8 @@ elif [ -r /root/.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif [ -r /.shorewallrc ]; then elif [ -r /.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
VARDIR=/var/lib VARDIR=/var/lib
LIBEXECDIR=/usr/share LIBEXECDIR=/usr/share

View File

@ -35,8 +35,8 @@ elif [ -r /root/.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif [ -r /.shorewallrc ]; then elif [ -r /.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=${CONFDIR}

View File

@ -101,7 +101,10 @@ else
VARDIR=/var/lib VARDIR=/var/lib
fi fi
[ -n "$TMPDIR" ] && export TMPDIR if [ -n "$TEMPDIR" ]; then
TMPDIR="$TEMPDIR"
export TMPDIR
fi
initialize initialize

View File

@ -36,7 +36,7 @@ elif [ -r /root/.shorewallrc ]; then
elif [ -r /.shorewallrc ]; then elif [ -r /.shorewallrc ]; then
. /root/.shorewallrc || exit 1 . /root/.shorewallrc || exit 1
elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=${CONFDIR}

View File

@ -27,8 +27,16 @@
################################################################################################ ################################################################################################
g_program=shorewall6-lite g_program=shorewall6-lite
if [ -f ~/.shorewallrc ]; then if [ -f ./.shorewallrc ]; then
. ./.shorewallrc || exit 1
elif [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.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 else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=${CONFDIR}