From 005615071332725e21c7fe400e6886dc3713e4b4 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 30 Nov 2006 21:28:31 +0000
Subject: [PATCH] More light-weight shell workarounds

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5026 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/lib.cli   | 4 ++--
 Shorewall/shorewall | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index bc8a4985c..7a6133ac8 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -402,7 +402,7 @@ show_command() {
 			    [ $# -eq 1 ] && usage 1
 
 			    case $2 in
-				mangle|nat|filter)
+				mangle|nat|filter|raw)
 				    table=$2
 				    ;;
 				*)
@@ -562,7 +562,7 @@ show_command() {
 		esac
 	    fi
 
-	    echo "$PRODUCT $version $([ $# -gt 0 ] && echo Chains || echo Chain) $* at $HOSTNAME - $(date)"
+	    echo "$PRODUCT $version $([ $# -gt 1 ] && echo "Chains " || [ $# -gt 0 ] && echo "Chain " || echo $table Table)$* at ${HOSTNAME:-$(hostname)} - $(date)"
 	    echo
 	    show_reset
 	    if [ $# -gt 0 ]; then
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index f4dbbf4ae..23c8633b2 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -208,6 +208,8 @@ get_config() {
 
     export VERBOSE
 
+    [ -n "${HOSTNAME:=$(hostname)}" ]
+
 }
 
 #