From 47e5fb56211dae9929b214b4b3ea3d8903546265 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Mon, 1 Mar 2021 17:21:40 -0700 Subject: [PATCH] usertool.pl: update pager setting logic Bring over the same new logic from projtool.pl that allows some commands to disable the pager by default without completely disallowing it. Signed-off-by: Kyle J. McKay --- toolbox/usertool.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/toolbox/usertool.pl b/toolbox/usertool.pl index 634dc22..186d910 100755 --- a/toolbox/usertool.pl +++ b/toolbox/usertool.pl @@ -632,11 +632,11 @@ BEGIN { ); } our %nopager; -BEGIN { - %nopager = map({$_ => 1} qw( - create - )); -} +BEGIN { %nopager = ( + # 1 => pager never allowed + # -1 => pager defaults to off instead of on + create => 1, +)} sub dohelp { my $cmd = shift; @@ -678,7 +678,8 @@ sub main { exists($commands{$command}) or die "Unknown command \"$command\" -- try \"help\"\n"; dohelp($command) if @ARGV && ($ARGV[0] =~ /^(?:-h|-?-help)$/i || $ARGV[0] =~ /^help$/i && !Girocco::User::does_exist("help",1)); - $nopager{$command} and $usepager = 0; - setup_pager_stdout($usepager); + $nopager{$command} && $nopager{$command} > 0 and $usepager = 0; + my $pgdfltoff = $nopager{$command} && $nopager{$command} < 0 ? 1 : 0; + setup_pager_stdout($usepager, $pgdfltoff); &{$commands{$command}}(@ARGV); } -- 2.11.4.GIT