[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
59/197: installer: Format configuration to fix width of window.
From: |
Danny Milosavljevic |
Subject: |
59/197: installer: Format configuration to fix width of window. |
Date: |
Mon, 3 Jul 2017 20:37:00 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit efc4ad846d57c0289aedbf92280126aa2ae73936
Author: John Darrington <address@hidden>
Date: Sat Dec 31 16:03:22 2016 +0000
installer: Format configuration to fix width of window.
* gnu/system/installer/configure.scm (generate-guix-config): Add #:width
argument to all usages of pretty-print.
---
gnu/system/installer/configure.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index b855923..f31b7ea 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington <address@hidden>
+;;; Copyright © 2016, 2017 John Darrington <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,7 +33,6 @@
#:use-module (guix store)
#:use-module (guix utils)
-
#:export (make-configure-page))
@@ -108,7 +107,7 @@
;; Write the configuration and set the file name
(let ((cfg-port (mkstemp! (string-copy
(string-append tempdir
"/guix-config-XXXXXX")))))
- (generate-guix-config cfg-port)
+ (generate-guix-config cfg-port 79)
(set! config-file (port-filename cfg-port))
(close-port cfg-port))
@@ -129,7 +128,7 @@
(refresh (inner (page-wwin page))))
-(define (generate-guix-config p)
+(define (generate-guix-config p width)
(let ((grub-mount-point
(find-mount-device "/boot/grub"
mount-points)))
@@ -140,15 +139,15 @@
`(gnu system grub))
(gnu system nss))
- p)
+ p #:width width)
(newline p)
(pretty-print
- `(use-service-modules desktop) p)
+ `(use-service-modules desktop) p #:width width)
(newline p)
(pretty-print
- `(use-package-modules certs) p)
+ `(use-package-modules certs) p #:width width)
(newline p)
(pretty-print
@@ -183,7 +182,7 @@
`((console-keymap-service ,key-map))
`())
%desktop-services))
- (name-service-switch %mdns-host-lookup-nss)) p)))
+ (name-service-switch %mdns-host-lookup-nss)) p #:width width)))
(define (configure-page-init p)
@@ -220,7 +219,7 @@
"The following configuration has been generated for you. If you
are satisfied with it you may save it and continue. Otherwise go back and
change some options."))
(let ((p (make-window-port (inner config-window))))
- (generate-guix-config p)
+ (generate-guix-config p (getmaxx (inner config-window)))
(force-output p))
(page-set-wwin! p pr)
- 38/197: installer: Correct bugs generating the configuration., (continued)
- 38/197: installer: Correct bugs generating the configuration., Danny Milosavljevic, 2017/07/03
- 45/197: installer: Fix bug where window-pipe did not return the proper exit status., Danny Milosavljevic, 2017/07/03
- 43/197: installer: Rename module "new" to "guixsd-installer"., Danny Milosavljevic, 2017/07/03
- 42/197: installer: Wrap installer in (catch #t ...), Danny Milosavljevic, 2017/07/03
- 48/197: installer: Close unused ports in pipe-cmd., Danny Milosavljevic, 2017/07/03
- 47/197: installer: Improve install page., Danny Milosavljevic, 2017/07/03
- 29/197: installer: Add a task to actually call guix system init., Danny Milosavljevic, 2017/07/03
- 53/197: installer: Change N_ from a procedure to a macro., Danny Milosavljevic, 2017/07/03
- 50/197: installer: Issue message to user on failure of filesystems task., Danny Milosavljevic, 2017/07/03
- 61/197: installer: Indicate which wireless access points are encrypted., Danny Milosavljevic, 2017/07/03
- 59/197: installer: Format configuration to fix width of window.,
Danny Milosavljevic <=
- 65/197: installer: Ensure that all mount points are absolute paths., Danny Milosavljevic, 2017/07/03
- 09/197: installer: Use a record instead of a list to contain tasks., Danny Milosavljevic, 2017/07/03
- 23/197: installer: Use a cleaner way of generating the lspci information., Danny Milosavljevic, 2017/07/03
- 35/197: installer: New predicate valid-hostname?, Danny Milosavljevic, 2017/07/03
- 36/197: installer: Ensure that all mount-points have a file system., Danny Milosavljevic, 2017/07/03
- 39/197: installer: Replace an instance of cdr with match., Danny Milosavljevic, 2017/07/03
- 46/197: installer: Replace "%temporary-configuration-file-port" with "config-file"., Danny Milosavljevic, 2017/07/03
- 30/197: installer: Write the configuration to a temporary file., Danny Milosavljevic, 2017/07/03
- 24/197: installer: Add a new menu to configure wireless interfaces., Danny Milosavljevic, 2017/07/03
- 49/197: installer: Replace spawned mount command with the mount syscall., Danny Milosavljevic, 2017/07/03