From: Taiju HIGASHI <higashi@taiju.info>
To: 55845@debbugs.gnu.org
Cc: Taiju HIGASHI <higashi@taiju.info>
Subject: [bug#55845] [PATCH 1/1] ui: Improve pager selection logic when less is not installed.
Date: Wed, 8 Jun 2022 19:22:57 +0900 [thread overview]
Message-ID: <20220608102257.15042-1-higashi@taiju.info> (raw)
In-Reply-To: <20220608102124.14865-1-higashi@taiju.info>
* guix/ui.scm (available-pager): New variable. Holds available pagers.
(call-with-paginated-output-port): Get an alternative program from the
available-pager variable when the environment variable is not set.
---
guix/ui.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index cb68a07c6c..22169a7eb8 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Steve Sprang <scs@stevesprang.com>
+;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1672,11 +1673,18 @@ (define* (pager-wrapped-port #:optional (port (current-output-port)))
(_
#f)))
+(define available-pager
+ (if (which "less")
+ "less"
+ (if (which "more")
+ "more"
+ #f)))
+
(define* (call-with-paginated-output-port proc
#:key (less-options "FrX"))
(let ((pager-command-line (or (getenv "GUIX_PAGER")
(getenv "PAGER")
- "less")))
+ available-pager)))
;; Setting PAGER to the empty string conventionally disables paging.
(if (and (not (string-null? pager-command-line))
(isatty?* (current-output-port)))
--
2.36.1
next prev parent reply other threads:[~2022-06-08 10:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 10:21 [bug#55845] [PATCH 0/1] Improve pager selection logic when less is not installed Taiju HIGASHI
2022-06-08 10:22 ` Taiju HIGASHI [this message]
2022-06-08 13:18 ` [bug#55845] [PATCH 1/1] ui: " Maxime Devos
[not found] ` <87leu72sbo.fsf@taiju.info>
2022-06-08 15:08 ` Maxime Devos
2022-06-08 15:17 ` Taiju HIGASHI
2022-06-08 16:46 ` Maxime Devos
2022-06-09 9:52 ` Taiju HIGASHI
2022-06-09 10:23 ` Taiju HIGASHI
2022-06-09 19:43 ` Maxime Devos
2022-06-10 0:39 ` Taiju HIGASHI
2022-06-10 7:47 ` Maxime Devos
2022-06-10 8:40 ` Taiju HIGASHI
2022-06-10 15:08 ` Maxime Devos
2022-06-11 11:26 ` Taiju HIGASHI
2022-06-14 23:58 ` Taiju HIGASHI
2022-06-15 8:02 ` Maxime Devos
2022-06-16 21:43 ` [bug#55845] [PATCH 0/1] " Ludovic Courtès
2022-06-17 0:38 ` Taiju HIGASHI
2022-06-17 12:39 ` Ludovic Courtès
2022-06-17 13:36 ` Taiju HIGASHI
2022-06-17 15:12 ` Ludovic Courtès
2022-06-18 14:11 ` Taiju HIGASHI
2022-06-10 0:55 ` [bug#55845] [PATCH 1/1] ui: " Taiju HIGASHI
2022-06-10 7:37 ` Maxime Devos
2022-06-10 8:52 ` Taiju HIGASHI
2022-06-08 12:14 ` [bug#55845] [PATCH 0/1] " Tobias Geerinckx-Rice via Guix-patches via
2022-06-08 13:12 ` Taiju HIGASHI
2022-06-08 14:22 ` Tobias Geerinckx-Rice via Guix-patches via
2022-06-08 15:09 ` Taiju HIGASHI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220608102257.15042-1-higashi@taiju.info \
--to=higashi@taiju.info \
--cc=55845@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.