dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 5aee69d3cc314c3bb92701bc763ed85553d6ef0b
Author: John Darrington <[email protected]>
Date: Wed Dec 21 16:28:09 2016 +0100
installer: Use call-with-temporary-output-file.
* gnu/system/installer/new.scm (base-page-key-handler): Use existing
call-with-temporary-output-file procedure instead of rolling our own.
---
gnu/system/installer/new.scm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/system/installer/new.scm b/gnu/system/installer/new.scm
index a9acbfe..9b18251 100644
--- a/gnu/system/installer/new.scm
+++ b/gnu/system/installer/new.scm
@@ -34,6 +34,7 @@
(gnu system installer dialog)
(guix build utils)
+ (guix utils)
(ice-9 format)
(ice-9 match)
@@ -149,13 +150,14 @@
(define (base-page-key-handler page ch)
(cond
((eqv? ch (key-f 1))
- (endwin)
- (let* ((p (mkstemp! (string-copy "/tmp/installer.XXXXXX")))
- (file-name (port-filename p)))
- (format p "echo '~a'\n" (gettext "Type \"exit\" to return to the GuixSD
installer."))
- (close p)
- (system* "bash" "--rcfile" file-name)
- (delete-file file-name)))
+
+ (call-with-temporary-output-file
+ (lambda (file-name port)
+ (endwin)
+ (format port "echo '~a'\n"
+ (gettext "Type \"exit\" to return to the GuixSD installer."))
+ (close port)
+ (system* "bash" "--rcfile" file-name))))
((eqv? ch (key-f 9))
(setlocale LC_ALL "de_DE.UTF-8")
