From 29a820b2f27c24105d5d9f9351f46f4928df9758 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 4 Apr 2012 11:47:45 -0700 Subject: [PATCH] Make handling of remote configuration data consistent. Signed-off-by: Tom Eastep --- Shorewall/lib.cli-std | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 94758270d..9c2b068c7 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -1310,6 +1310,8 @@ reload_command() # $* = original arguments less the command. libexec=/usr/share local confdir confdir=/etc + local sbindir + sbindir=/sbin litedir=/var/lib/${g_program}-lite @@ -1385,11 +1387,7 @@ reload_command() # $* = original arguments less the command. temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^SBINDIR | sed 's/SBINDIR is //') - if [ -n "$temp" ]; then - sbindir="$temp" - else - sbindir=/sbin - fi + [ -n "$temp" ] && sbindir="$temp" temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^CONFDIR | sed 's/CONFDIR is //')