me
/
guix
Archived
1
0
Fork 0
Code

status: Spin only on TTYs. 

* guix/status.scm (isatty?*): New procedure.
(spin!): Do nothing when port matches ISATTY?*.
(color-output?): Use ISATTY?*.
master
Ludovic Courtès 2019-01-15 11:47:25 +01:00
parent 35225dc579
commit 0c1bc5ecbe
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/status.scm
View File

@ -27,6 +27,7 @@
#:select (nar-uri-abbreviation)) #:select (nar-uri-abbreviation))
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix memoization)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-19) #:use-module (srfi srfi-19)
@ -229,22 +230,27 @@ build-log\" traces."
(and (current-store-protocol-version) (and (current-store-protocol-version)
(>= (current-store-protocol-version) #x163))) (>= (current-store-protocol-version) #x163)))
(define isatty?*
(mlambdaq (port)
(isatty? port)))
(define spin! (define spin!
(let ((steps (circular-list "\\" "|" "/" "-"))) (let ((steps (circular-list "\\" "|" "/" "-")))
(lambda (port) (lambda (port)
"Display a spinner on PORT." "Display a spinner on PORT."
(match steps (when (isatty?* port)
((first . rest) (match steps
(set! steps rest) ((first . rest)
(display "\r\x1b[K" port) (set! steps rest)
(display first port) (display "\r\x1b[K" port)
(force-output port)))))) (display first port)
(force-output port)))))))
(define (color-output? port) (define (color-output? port)
"Return true if we should write colored output to PORT." "Return true if we should write colored output to PORT."
(and (not (getenv "INSIDE_EMACS")) (and (not (getenv "INSIDE_EMACS"))
(not (getenv "NO_COLOR")) (not (getenv "NO_COLOR"))
(isatty? port))) (isatty?* port)))
(define-syntax color-rules (define-syntax color-rules
(syntax-rules () (syntax-rules ()