diff options
| author | Taiju HIGASHI <higashi@taiju.info> | 2022-06-08 18:50:28 +0900 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-16 23:57:41 +0200 |
| commit | c8803d89fe531a1ff0de8ccdbc77c86249d5e778 (patch) | |
| tree | 06142478b57671037d4c4d1d834698deb38a62e5 /guix | |
| parent | a88de093fb22a6feb07aaeee7a7663a2aab6678f (diff) | |
| download | guix-c8803d89fe531a1ff0de8ccdbc77c86249d5e778.tar.gz guix-c8803d89fe531a1ff0de8ccdbc77c86249d5e778.tar.xz | |
ui: Improve pager selection logic when less is not installed.
* guix/ui.scm (find-available-pager): New procedure.
(call-with-paginated-output-port): Use it.
* guix/utils.scm (call-with-environment-variables): Allow clearing of
specified environment variables.
* tests/ui.scm (make-empty-file, assert-equals-find-available-pager):
New procedures.
("find-available-pager, GUIX_PAGER takes precedence")
("find-available-pager, PAGER takes precedence")
("find-available-pager, 'less' takes precedence")
("find-available-pager, 'more' takes precedence")
("find-available-pager, no pager"): New tests.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/ui.scm | 14 | ||||
| -rw-r--r-- | guix/utils.scm | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index cb68a07c6c..a7acd41440 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 @@ return the underlying port. Otherwise return #f." (_ #f))) +(define (find-available-pager) + "Return the program name of an available pager or the empty string if none is +available." + (or (getenv "GUIX_PAGER") + (getenv "PAGER") + (which "less") + (which "more") + "")) + (define* (call-with-paginated-output-port proc #:key (less-options "FrX")) - (let ((pager-command-line (or (getenv "GUIX_PAGER") - (getenv "PAGER") - "less"))) + (let ((pager-command-line (find-available-pager))) ;; Setting PAGER to the empty string conventionally disables paging. (if (and (not (string-null? pager-command-line)) (isatty?* (current-output-port))) diff --git a/guix/utils.scm b/guix/utils.scm index 37b2e29800..5c36b15cfe 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2018 Steve Sprang <scs@stevesprang.com> +;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info> ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,6 +159,8 @@ (dynamic-wind (lambda () (for-each (match-lambda + ((variable #false) + (unsetenv variable)) ((variable value) (setenv variable value))) variables)) |