5 files changed, 1 insertions(+), 22 deletions(-)

M guix/scripts/build.scm
M guix/scripts/download.scm
M guix/scripts/import.scm
M guix/scripts/package.scm
M guix/ui.scm

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

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

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

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

@@ 30,8 30,6 @@
   #:use-module (ice-9 match)
   #:export (_
             N_
-            install-locale
-            initialize-guix
             leave
             show-version-and-exit
             show-bug-report-information


@@ 67,6 65,7 @@
               (strerror (system-error-errno args))))))
 
 (define (initialize-guix)
+  "Perform the usual initialization for stand-alone Guix commands."
   (install-locale)
   (textdomain "guix")
   (setvbuf (current-output-port) _IOLBF)