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

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>
This commit is contained in:
Mathieu Lirzin 2018-01-23 12:52:33 +01:00 committed by Ludovic Courtès
parent 1b5bee004b
commit 6f774d4818
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/guix.in
View File

@ -1,4 +1,5 @@
#!@GUILE@ --no-auto-compile #!@GUILE@ \
--no-auto-compile -e main -s
-*- scheme -*- -*- scheme -*-
!# !#
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
@ -25,34 +26,34 @@
;; It's okay to import modules from core Guile though. ;; It's okay to import modules from core Guile though.
(use-modules (srfi srfi-26)) (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!) (define (augment-load-paths!)
(unless (getenv "GUIX_UNINSTALLED") ;; Add installed modules to load-path.
(push! "@guilemoduledir@" %load-path) (push! "@guilemoduledir@" %load-path)
(push! "@guileobjectdir@" %load-compiled-path) (push! "@guileobjectdir@" %load-compiled-path)
;; Add modules fetched by 'guix pull' to load-path.
(let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME") (let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
(and=> (getenv "HOME") (and=> (getenv "HOME")
(cut string-append <> "/.config"))) (cut string-append <> "/.config")))
(cut string-append <> "/guix/latest")))) (cut string-append <> "/guix/latest"))))
(when (and updates-dir (file-exists? updates-dir)) (when (and=> updates-dir file-exists?)
;; XXX: Currently 'guix pull' puts both .scm and .go files in ;; XXX: Currently 'guix pull' puts both .scm and .go files in
;; UPDATES-DIR. ;; UPDATES-DIR.
(push! updates-dir %load-path) (push! updates-dir %load-path)
(push! updates-dir %load-compiled-path))))) (push! updates-dir %load-compiled-path))))
(define* (main #:optional (args (command-line)))
(unless (getenv "GUIX_UNINSTALLED")
(augment-load-paths!))
(define (run-guix-main)
(let ((guix-main (module-ref (resolve-interface '(guix ui)) (let ((guix-main (module-ref (resolve-interface '(guix ui))
'guix-main))) 'guix-main)))
(bindtextdomain "guix" "@localedir@") (bindtextdomain "guix" "@localedir@")
(bindtextdomain "guix-packages" "@localedir@") (bindtextdomain "guix-packages" "@localedir@")
(apply guix-main (command-line))))
(maybe-augment-load-paths!)
;; XXX: It would be more convenient to change it to: ;; XXX: It would be more convenient to change it to:
;; (exit (run-guix-main)) ;; (exit (apply guix-main (command-line)))
;; but since the 'guix' command is not updated by 'guix pull', we cannot ;; but since the 'guix' command is not updated by 'guix pull', we cannot
;; really do it now. ;; really do it now.
(run-guix-main)) (apply guix-main args)))