From ab9f340c55961eda5b18aec454282bf95afde6dc Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 17 Nov 2016 10:57:39 -0800 Subject: [PATCH] use $PAGER in the 'show macro' command Signed-off-by: Tom Eastep --- Shorewall-core/lib.cli | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 702d116c8..0e0fa595f 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -1161,6 +1161,7 @@ show_macros() { done } + echo "Shorewall $SHOREWALL_VERSION Macro $1 at $g_hostname - $(date)" # # Show Command Executor # @@ -1441,8 +1442,7 @@ show_command() { [ $# -ne 2 ] && too_many_arguments $2 for directory in $(split $CONFIG_PATH); do if [ -f ${directory}/macro.$2 ]; then - echo "Shorewall $SHOREWALL_VERSION Macro $2 at $g_hostname - $(date)" - cat ${directory}/macro.$2 + eval show_a_macro $2 $g_pager return fi done