From c07512179ef50cc50067844ec7ab15a228c70ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 17 Feb 2013 15:38:02 +0100
Subject: [PATCH] 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.
---
 guix/scripts/build.scm    | 5 -----
 guix/scripts/download.scm | 5 -----
 guix/scripts/import.scm   | 5 -----
 guix/scripts/package.scm  | 5 -----
 guix/ui.scm               | 3 +--
 5 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index bad04418f1..3e241ca9da 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -221,11 +221,6 @@ (define (find-package request)
                     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)))
diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm
index 1098e6714b..790cf9fc2f 100644
--- a/guix/scripts/download.scm
+++ b/guix/scripts/download.scm
@@ -121,11 +121,6 @@ (define (parse-options)
                  (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))
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index 0bc6926c66..f0aaa80aa0 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -102,11 +102,6 @@ (define (parse-options)
                  (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)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 4935837d33..559be50824 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -676,11 +676,6 @@ (define (process-query opts)
            #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)))
diff --git a/guix/ui.scm b/guix/ui.scm
index 644a3070f6..af8b238ce1 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -30,8 +30,6 @@ (define-module (guix ui)
   #:use-module (ice-9 match)
   #:export (_
             N_
-            install-locale
-            initialize-guix
             leave
             show-version-and-exit
             show-bug-report-information
@@ -67,6 +65,7 @@ (define (install-locale)
               (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)