diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index eb7bb8014..a4d9243df 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -859,7 +859,7 @@ show_command() { echo "VARDIR=$VARDIR" echo "LIBEXEC=$g_libexec" echo "SBINDIR=$g_sbindir" - [ -n "$g_lite" ] && ${VARDIR} ne /var/lib/$program && echo "LITEDIR=${VARDIR}" + [ -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" diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 5395fd85f..1f5f07ea4 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -33,7 +33,7 @@ g_program=shorewall-lite . /usr/share/shorewall/shorewallrc g_libexec="$LIBEXECDIR" -g_sharedir="$SHAREDIR"/shoerwall-lite +g_sharedir="$SHAREDIR"/shorewall-lite g_sbindir="$SBINDIR" g_confdir="$CONFDIR"/shorewall-lite g_readrc=1 diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index f507e7da3..28486f161 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -1364,13 +1364,11 @@ reload_command() # $* = original arguments less the command. ;; esac - config=$(rsh_command ${g_program}-lite show config 2> /dev/null) - - temp=$(echo $config | grep ^LITEDIR | sed 's/LITEDIR is //') + temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //') [ -n "$temp" ] && litedir="$temp" - temp=$(echo $config | grep ^LIBEXEC | sed 's/LIBEXEC is //') + temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^LIBEXEC | sed 's/LIBEXEC is //') if [ -n "$temp" ]; then case $temp in @@ -1383,7 +1381,7 @@ reload_command() # $* = original arguments less the command. esac fi - temp=$(echo $config | grep ^SBINDIR | sed 's/SBINDIR is //') + temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^SBINDIR | sed 's/SBINDIR is //') if [ -n "$temp" ]; then sbindir="$temp" @@ -1435,15 +1433,15 @@ reload_command() # $* = original arguments less the command. progress_message3 "Copy complete" if [ $COMMAND = reload ]; then - rsh_command "${sbin}/${g_program}-lite $g_debugging $verbose $timestamp restart" && \ + rsh_command "${sbindir}/${g_program}-lite $g_debugging $verbose $timestamp restart" && \ progress_message3 "System $system reloaded" || saveit= else - rsh_command "${sbin}/${g_program}-lite $g_debugging $verbose $timestamp start" && \ + rsh_command "${sbindir}/${g_program}-lite $g_debugging $verbose $timestamp start" && \ progress_message3 "System $system loaded" || saveit= fi if [ -n "$saveit" ]; then - rsh_command "${sbin}/${g_program}-lite $g_debugging $verbose $timestamp save" && \ + rsh_command "${sbindir}/${g_program}-lite $g_debugging $verbose $timestamp save" && \ progress_message3 "Configuration on system $system saved" fi fi