mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-22 10:41:23 +02:00
Implement -p option to disable PAGER
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
ab9f340c55
commit
9eb390403b
@ -1161,7 +1161,11 @@ show_macros() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
show_a_macro() {
|
||||||
echo "Shorewall $SHOREWALL_VERSION Macro $1 at $g_hostname - $(date)"
|
echo "Shorewall $SHOREWALL_VERSION Macro $1 at $g_hostname - $(date)"
|
||||||
|
cat ${directory}/macro.$1
|
||||||
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Show Command Executor
|
# Show Command Executor
|
||||||
#
|
#
|
||||||
@ -3992,24 +3996,26 @@ get_config() {
|
|||||||
|
|
||||||
g_loopback=$(find_loopback_interfaces)
|
g_loopback=$(find_loopback_interfaces)
|
||||||
|
|
||||||
[ -n "$PAGER" ] || PAGER=$DEFAULT_PAGER
|
if [ -z "$g_nopager" ]; then
|
||||||
|
[ -n "$PAGER" ] || PAGER=$DEFAULT_PAGER
|
||||||
|
|
||||||
if [ -n "$PAGER" -a -t 1 ]; then
|
if [ -n "$PAGER" -a -t 1 ]; then
|
||||||
case $PAGER in
|
case $PAGER in
|
||||||
/*)
|
/*)
|
||||||
g_pager="$PAGER"
|
g_pager="$PAGER"
|
||||||
[ -f "$g_pager" ] || fatal_error "PAGER=$PAGER does not exist"
|
[ -f "$g_pager" ] || fatal_error "PAGER=$PAGER does not exist"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
g_pager=$(mywhich $PAGER 2> /dev/null)
|
g_pager=$(mywhich $PAGER 2> /dev/null)
|
||||||
[ -n "$g_pager" ] || fatal_error "PAGER=$PAGER does not exist"
|
[ -n "$g_pager" ] || fatal_error "PAGER=$PAGER does not exist"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[ -x "$g_pager" ] || fatal_error "PAGER $g_pager is not executable"
|
[ -x "$g_pager" ] || fatal_error "PAGER $g_pager is not executable"
|
||||||
|
|
||||||
g_pager="| $g_pager"
|
g_pager="| $g_pager"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "$DYNAMIC_BLACKLIST" ]; then
|
if [ -n "$DYNAMIC_BLACKLIST" ]; then
|
||||||
setup_dbl
|
setup_dbl
|
||||||
@ -4357,6 +4363,7 @@ shorewall_cli() {
|
|||||||
g_loopback=
|
g_loopback=
|
||||||
g_compiled=
|
g_compiled=
|
||||||
g_pager=
|
g_pager=
|
||||||
|
g_nopager=
|
||||||
g_blacklistipset=
|
g_blacklistipset=
|
||||||
g_disconnect=
|
g_disconnect=
|
||||||
|
|
||||||
@ -4453,6 +4460,11 @@ shorewall_cli() {
|
|||||||
g_timestamp=Yes
|
g_timestamp=Yes
|
||||||
option=${option#t}
|
option=${option#t}
|
||||||
;;
|
;;
|
||||||
|
p*)
|
||||||
|
g_nopager=Yes
|
||||||
|
option=${option#p}
|
||||||
|
;;
|
||||||
|
|
||||||
-)
|
-)
|
||||||
finished=1
|
finished=1
|
||||||
option=
|
option=
|
||||||
|
@ -318,21 +318,23 @@ get_config() {
|
|||||||
|
|
||||||
[ -n "$PAGER" ] || PAGER=$DEFAULT_PAGER
|
[ -n "$PAGER" ] || PAGER=$DEFAULT_PAGER
|
||||||
|
|
||||||
if [ -n "$PAGER" -a -t 1 ]; then
|
if [ -z "$g_nopager" ]; then
|
||||||
case $PAGER in
|
if [ -n "$PAGER" -a -t 1 ]; then
|
||||||
/*)
|
case $PAGER in
|
||||||
g_pager="$PAGER"
|
/*)
|
||||||
[ -f "$g_pager" ] || fatal_error "PAGER $PAGER does not exist"
|
g_pager="$PAGER"
|
||||||
;;
|
[ -f "$g_pager" ] || fatal_error "PAGER $PAGER does not exist"
|
||||||
*)
|
;;
|
||||||
g_pager=$(mywhich $PAGER 2> /dev/null)
|
*)
|
||||||
[ -n "$g_pager" ] || fatal_error "PAGER $PAGER not found"
|
g_pager=$(mywhich $PAGER 2> /dev/null)
|
||||||
;;
|
[ -n "$g_pager" ] || fatal_error "PAGER $PAGER not found"
|
||||||
esac
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
[ -x "$g_pager" ] || fatal_error "PAGER $g_pager is not executable"
|
[ -x "$g_pager" ] || fatal_error "PAGER $g_pager is not executable"
|
||||||
|
|
||||||
g_pager="| $g_pager"
|
g_pager="| $g_pager"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$DYNAMIC_BLACKLIST" ]; then
|
if [ -n "$DYNAMIC_BLACKLIST" ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user