nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts: Remove initialization now redundant with `initialize-guix'. 

* guix/scripts/build.scm (guix-build): Remove calls to `install-locale',
  `textdomain', etc., now redundant with `initialize-guix'.
* guix/scripts/download.scm (guix-download): Likewise.
* guix/scripts/import.scm (guix-import): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/ui.scm: Remove export of `install-locale' and `initialize-guix'.
  (initialize-guix): Add docstring.
This commit is contained in:
Ludovic Courtès 2013-02-17 15:38:02 +01:00
parent ed407c8055
commit c07512179e
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/build.scm
View File

@ -221,11 +221,6 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
name version) name version)
(leave (_ "~A: unknown package~%") name)))))) (leave (_ "~A: unknown package~%") name))))))
(install-locale)
(textdomain "guix")
(setvbuf (current-output-port) _IOLBF)
(setvbuf (current-error-port) _IOLBF)
(with-error-handling (with-error-handling
(let ((opts (parse-options))) (let ((opts (parse-options)))
(parameterize ((%store (open-connection))) (parameterize ((%store (open-connection)))

5
guix/scripts/download.scm
View File

@ -121,11 +121,6 @@ and the hash of its contents.\n"))
(alist-cons 'argument arg result)) (alist-cons 'argument arg result))
%default-options)) %default-options))
(install-locale)
(textdomain "guix")
(setvbuf (current-output-port) _IOLBF)
(setvbuf (current-error-port) _IOLBF)
(let* ((opts (parse-options)) (let* ((opts (parse-options))
(store (open-connection)) (store (open-connection))
(arg (assq-ref opts 'argument)) (arg (assq-ref opts 'argument))

5
guix/scripts/import.scm
View File

@ -102,11 +102,6 @@ Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"))
(alist-cons 'argument arg result)) (alist-cons 'argument arg result))
%default-options)) %default-options))
(install-locale)
(textdomain "guix")
(setvbuf (current-output-port) _IOLBF)
(setvbuf (current-error-port) _IOLBF)
(let* ((opts (parse-options)) (let* ((opts (parse-options))
(args (filter-map (match-lambda (args (filter-map (match-lambda
(('argument . value) (('argument . value)

5
guix/scripts/package.scm
View File

@ -676,11 +676,6 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
#t)) #t))
(_ #f)))) (_ #f))))
(install-locale)
(textdomain "guix")
(setvbuf (current-output-port) _IOLBF)
(setvbuf (current-error-port) _IOLBF)
(let ((opts (parse-options))) (let ((opts (parse-options)))
(or (process-query opts) (or (process-query opts)
(parameterize ((%store (open-connection))) (parameterize ((%store (open-connection)))

3
guix/ui.scm
View File

@ -30,8 +30,6 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (_ #:export (_
N_ N_
install-locale
initialize-guix
leave leave
show-version-and-exit show-version-and-exit
show-bug-report-information show-bug-report-information
@ -67,6 +65,7 @@
(strerror (system-error-errno args)))))) (strerror (system-error-errno args))))))
(define (initialize-guix) (define (initialize-guix)
"Perform the usual initialization for stand-alone Guix commands."
(install-locale) (install-locale)
(textdomain "guix") (textdomain "guix")
(setvbuf (current-output-port) _IOLBF) (setvbuf (current-output-port) _IOLBF)