From c1d00721bf99bab155dca7cc587723662b0d530b Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Mon, 1 Mar 2021 17:34:09 -0700
Subject: [PATCH] projtool/usertool: default paging to off for most commands

For commands that are not expected to produce very much output
if any at all and do not require that the pager always be disabled
because they prompt for input, set the pager to off by default.

It can still be explicitly enabled for these commands, but
setting it off by default makes more sense especially for
commands that will be modifying settings and might return
a non-zero exit status that would otherwise be lost to
the pager.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 toolbox/projtool.pl | 36 ++++++++++++++++++++++++++++++++----
 toolbox/usertool.pl |  7 ++++++-
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/toolbox/projtool.pl b/toolbox/projtool.pl
index 73b9a96..2d16bc9 100755
--- a/toolbox/projtool.pl
+++ b/toolbox/projtool.pl
@@ -2053,10 +2053,38 @@ our %nopager;
 BEGIN { %nopager = (
 	# 1 => pager never allowed
 	# -1 => pager defaults to off instead of on
-	create	=> 1,
-	chpass	=> 1,
-	checkpw	=> 1,
-	prune	=> -1,
+	create		=> 1,
+	adopt		=> -1,
+	remove		=> -1,
+	trash		=> -1,
+	delete		=> -1,
+	prune		=> -1,
+	deltags		=> -1,
+	delctags	=> -1,
+	addtags		=> -1,
+	addctags	=> -1,
+	chpass		=> 1,
+	checkpw		=> 1,
+	gc		=> -1,
+	update		=> -1,
+	remirror	=> -1,
+	setowner	=> -1,
+	setdesc		=> -1,
+	setdescription	=> -1,
+	setreadme	=> -1,
+	sethead		=> -1,
+	sethooks	=> -1,
+	sethookspath	=> -1,
+	setbool		=> -1,
+	setboolean	=> -1,
+	setflag		=> -1,
+	setautogchack	=> -1,
+	seturl		=> -1,
+	setjsontype	=> -1,
+	setjsonsecret	=> -1,
+	setmsgs		=> -1,
+	setusers	=> -1,
+	set		=> -1,
 )}
 
 sub dohelp {
diff --git a/toolbox/usertool.pl b/toolbox/usertool.pl
index 186d910..875c777 100755
--- a/toolbox/usertool.pl
+++ b/toolbox/usertool.pl
@@ -635,7 +635,12 @@ our %nopager;
 BEGIN { %nopager = (
 	# 1 => pager never allowed
 	# -1 => pager defaults to off instead of on
-	create	=> 1,
+	create		=> 1,
+	remove		=> -1,
+	delete		=> -1,
+	setemail	=> -1,
+	setkeys		=> -1,
+	set		=> -1,
 )}
 
 sub dohelp {
-- 
2.11.4.GIT