ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Run 'guix system init' with the right locale.

Browse source 
* gnu/installer/utils.scm (run-shell-command): Add #:locale and honor it.
* gnu/installer/newt/final.scm (run-install-shell): Add 'locale'
parameter; pass it to 'install-system'.
(run-final-page): Obtain locale from RESULT; pass it to 'run-install-shell'.
* gnu/installer/final.scm (install-system): Add 'locale' parameter; pass
it to 'run-shell-command'.
This commit is contained in:
Ludovic Courtès 2019-04-23 00:08:54 +02:00
parent 5582aa8e31
commit 7611074f67
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/installer/final.scm
View file

@ -24,13 +24,15 @@ (define-module (gnu installer final)
#:use-module (guix build utils)
#:export (install-system))
(define (install-system)
(define (install-system locale)
"Start COW-STORE service on target directory and launch guix install command
in a subshell."
in a subshell. LOCALE must be the locale name under which that command will
run, or #f."
(let ((install-command
(format #f "guix system init ~a ~a"
(%installer-configuration-file)
(%installer-target-dir))))
(mkdir-p (%installer-target-dir))
(start-service 'cow-store (list (%installer-target-dir)))
(false-if-exception (run-shell-command install-command))))
(false-if-exception (run-shell-command install-command
#:locale locale))))

9
gnu/installer/newt/final.scm
View file

@ -65,22 +65,23 @@ (define (run-install-failed-page)
(G_ "The final system installation step failed. You can retry the \
last step, or restart the installer.")))
(define (run-install-shell)
(define (run-install-shell locale)
(clear-screen)
(newt-suspend)
(let ((install-ok? (install-system)))
(let ((install-ok? (install-system locale)))
(newt-resume)
install-ok?))
(define (run-final-page result prev-steps)
(let* ((configuration (format-configuration prev-steps result))
(let* ((configuration (format-configuration prev-steps result))
(user-partitions (result-step result 'partition))
(locale (result-step result 'locale))
(install-ok?
(with-mounted-partitions
user-partitions
(configuration->file configuration)
(run-config-display-page)
(run-install-shell))))
(run-install-shell locale))))
(if install-ok?
(run-install-success-page)
(run-install-failed-page))))

14
gnu/installer/utils.scm
View file

@ -54,9 +54,21 @@ (define (read-percentage percentage)
(and result
(string->number (match:substring result 1)))))
(define (run-shell-command command)
(define* (run-shell-command command #:key locale)
"Run COMMAND, a string, with Bash, and in the given LOCALE."
(call-with-temporary-output-file
(lambda (file port)
(when locale
(let ((supported? (false-if-exception
(setlocale LC_ALL locale))))
;; If LOCALE is not supported, then set LANGUAGE, which might at
;; least give us translated messages.
(if supported?
(format port "export LC_ALL=\"~a\"~%" locale)
(format port "export LANGUAGE=\"~a\"~%"
(string-take locale
(string-index locale #\_))))))
(format port "~a~%" command)
;; (format port "exit~%")
(close port)