summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2018-01-23 12:52:33 +0100
committerLudovic Courtès <ludo@gnu.org>2018-01-23 15:01:15 +0100
commit6f774d481839f87178c5895ac2d661e141f879b8 (patch)
treed5fa26bd53d4f4132eab14155b409a7b3f85e878
parent1b5bee004bc2558ecb45877645edb9abb0571591 (diff)
guix: Refactor script.
* scripts/guix.in: Remove empty surrounding ‘let’. Define 'main' as the procedure called when running the script. (maybe-augment-load-paths!): Rename to ... (augment-load-paths!): ... this. Use 'and=>' for 'file-exists?'. (run-guix-main): Rename to ... (main): ... this. Call 'augment-load-paths!'. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--scripts/guix.in57
1 files changed, 29 insertions, 28 deletions
diff --git a/scripts/guix.in b/scripts/guix.in
index af50a782bb..e0f0ae7e06 100644
--- a/scripts/guix.in
+++ b/scripts/guix.in
@@ -1,4 +1,5 @@
-#!@GUILE@ --no-auto-compile
+#!@GUILE@ \
+--no-auto-compile -e main -s
-*- scheme -*-
!#
;;; GNU Guix --- Functional package management for GNU
@@ -25,34 +26,34 @@
;; It's okay to import modules from core Guile though.
(use-modules (srfi srfi-26))
-(let ()
- (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+(define-syntax-rule (push! elt v) (set! v (cons elt v)))
- (define (maybe-augment-load-paths!)
- (unless (getenv "GUIX_UNINSTALLED")
- (push! "@guilemoduledir@" %load-path)
- (push! "@guileobjectdir@" %load-compiled-path)
- (let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
- (and=> (getenv "HOME")
- (cut string-append <> "/.config")))
- (cut string-append <> "/guix/latest"))))
- (when (and updates-dir (file-exists? updates-dir))
- ;; XXX: Currently 'guix pull' puts both .scm and .go files in
- ;; UPDATES-DIR.
- (push! updates-dir %load-path)
- (push! updates-dir %load-compiled-path)))))
+(define (augment-load-paths!)
+ ;; Add installed modules to load-path.
+ (push! "@guilemoduledir@" %load-path)
+ (push! "@guileobjectdir@" %load-compiled-path)
- (define (run-guix-main)
- (let ((guix-main (module-ref (resolve-interface '(guix ui))
- 'guix-main)))
- (bindtextdomain "guix" "@localedir@")
- (bindtextdomain "guix-packages" "@localedir@")
- (apply guix-main (command-line))))
+ ;; Add modules fetched by 'guix pull' to load-path.
+ (let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
+ (and=> (getenv "HOME")
+ (cut string-append <> "/.config")))
+ (cut string-append <> "/guix/latest"))))
+ (when (and=> updates-dir file-exists?)
+ ;; XXX: Currently 'guix pull' puts both .scm and .go files in
+ ;; UPDATES-DIR.
+ (push! updates-dir %load-path)
+ (push! updates-dir %load-compiled-path))))
- (maybe-augment-load-paths!)
+(define* (main #:optional (args (command-line)))
+ (unless (getenv "GUIX_UNINSTALLED")
+ (augment-load-paths!))
- ;; XXX: It would be more convenient to change it to:
- ;; (exit (run-guix-main))
- ;; but since the 'guix' command is not updated by 'guix pull', we cannot
- ;; really do it now.
- (run-guix-main))
+ (let ((guix-main (module-ref (resolve-interface '(guix ui))
+ 'guix-main)))
+ (bindtextdomain "guix" "@localedir@")
+ (bindtextdomain "guix-packages" "@localedir@")
+ ;; XXX: It would be more convenient to change it to:
+ ;; (exit (apply guix-main (command-line)))
+ ;; but since the 'guix' command is not updated by 'guix pull', we cannot
+ ;; really do it now.
+ (apply guix-main args)))