[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Improve shell script headers and pre-inst-env handling
From: |
Mark H Weaver |
Subject: |
Re: [PATCH] Improve shell script headers and pre-inst-env handling |
Date: |
Mon, 11 Feb 2013 23:36:30 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
Here's an improved version of the second patch. There's no functional
difference, but the code is easier to read IMO.
Mark
>From b1ea7f6ab01fb5c1ae1638315dad3fc8903682dc Mon Sep 17 00:00:00 2001
From: Mark H Weaver <address@hidden>
Date: Mon, 11 Feb 2013 19:13:32 -0500
Subject: [PATCH 2/2] Improve shell script headers and pre-inst-env handling.
* pre-inst-env.in: Define $GUIX_UNINSTALLED.
* guix-build.in, guix-download.in, guix-gc.in, guix-import.in,
guix-package.in: Rewrite shell script headers to augment '%load-path' and
'%load-compiled-path' within Guile itself instead of setting environment
variables. Inhibit this behavior if $GUIX_UNINSTALLED is set.
---
guix-build.in | 22 ++++++++++++++++------
guix-download.in | 22 ++++++++++++++++------
guix-gc.in | 22 ++++++++++++++++------
guix-import.in | 22 ++++++++++++++++------
guix-package.in | 22 ++++++++++++++++------
pre-inst-env.in | 7 ++++++-
6 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/guix-build.in b/guix-build.in
index f8c7115..29241c7 100644
--- a/guix-build.in
+++ b/guix-build.in
@@ -1,15 +1,25 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
+script=guix-build
+
prefix="@prefix@"
datarootdir="@datarootdir@"
-GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH"
-export GUILE_LOAD_COMPILED_PATH
-
-main='(module-ref (resolve-interface '\''(guix-build)) '\'guix-build')'
-exec address@hidden@} -L "@guilemoduledir@" -l "$0" \
- -c "(apply $main (cdr (command-line)))" "$@"
+startup="
+(let ()
+ (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+ (define (main interpreter module-dir script-file . args)
+ (unless (getenv \"GUIX_UNINSTALLED\")
+ (push! module-dir %load-path)
+ (push! module-dir %load-compiled-path))
+ (load script-file)
+ (let ((proc (module-ref (resolve-interface '($script))
+ '$script)))
+ (apply proc args)))
+ (apply main (command-line)))
+"
+exec "address@hidden@}" -c "$startup" "@guilemoduledir@" "$0" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
diff --git a/guix-download.in b/guix-download.in
index ea62b09..ccffbde 100644
--- a/guix-download.in
+++ b/guix-download.in
@@ -1,15 +1,25 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
+script=guix-download
+
prefix="@prefix@"
datarootdir="@datarootdir@"
-GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH"
-export GUILE_LOAD_COMPILED_PATH
-
-main='(module-ref (resolve-interface '\''(guix-download)) '\'guix-download')'
-exec address@hidden@} -L "@guilemoduledir@" -l "$0" \
- -c "(apply $main (cdr (command-line)))" "$@"
+startup="
+(let ()
+ (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+ (define (main interpreter module-dir script-file . args)
+ (unless (getenv \"GUIX_UNINSTALLED\")
+ (push! module-dir %load-path)
+ (push! module-dir %load-compiled-path))
+ (load script-file)
+ (let ((proc (module-ref (resolve-interface '($script))
+ '$script)))
+ (apply proc args)))
+ (apply main (command-line)))
+"
+exec "address@hidden@}" -c "$startup" "@guilemoduledir@" "$0" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
diff --git a/guix-gc.in b/guix-gc.in
index 1a4a541..84f18dd 100644
--- a/guix-gc.in
+++ b/guix-gc.in
@@ -1,15 +1,25 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
+script=guix-gc
+
prefix="@prefix@"
datarootdir="@datarootdir@"
-GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH"
-export GUILE_LOAD_COMPILED_PATH
-
-main='(module-ref (resolve-interface '\''(guix-gc)) '\'guix-gc')'
-exec address@hidden@} -L "@guilemoduledir@" -l "$0" \
- -c "(apply $main (cdr (command-line)))" "$@"
+startup="
+(let ()
+ (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+ (define (main interpreter module-dir script-file . args)
+ (unless (getenv \"GUIX_UNINSTALLED\")
+ (push! module-dir %load-path)
+ (push! module-dir %load-compiled-path))
+ (load script-file)
+ (let ((proc (module-ref (resolve-interface '($script))
+ '$script)))
+ (apply proc args)))
+ (apply main (command-line)))
+"
+exec "address@hidden@}" -c "$startup" "@guilemoduledir@" "$0" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
diff --git a/guix-import.in b/guix-import.in
index 97619a9..2666d78 100644
--- a/guix-import.in
+++ b/guix-import.in
@@ -1,15 +1,25 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
+script=guix-import
+
prefix="@prefix@"
datarootdir="@datarootdir@"
-GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH"
-export GUILE_LOAD_COMPILED_PATH
-
-main='(module-ref (resolve-interface '\''(guix-import)) '\'guix-import')'
-exec address@hidden@} -L "@guilemoduledir@" -l "$0" \
- -c "(apply $main (cdr (command-line)))" "$@"
+startup="
+(let ()
+ (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+ (define (main interpreter module-dir script-file . args)
+ (unless (getenv \"GUIX_UNINSTALLED\")
+ (push! module-dir %load-path)
+ (push! module-dir %load-compiled-path))
+ (load script-file)
+ (let ((proc (module-ref (resolve-interface '($script))
+ '$script)))
+ (apply proc args)))
+ (apply main (command-line)))
+"
+exec "address@hidden@}" -c "$startup" "@guilemoduledir@" "$0" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
diff --git a/guix-package.in b/guix-package.in
index ae3d2cd..32d9afd 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -1,15 +1,25 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
+script=guix-package
+
prefix="@prefix@"
datarootdir="@datarootdir@"
-GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH"
-export GUILE_LOAD_COMPILED_PATH
-
-main='(module-ref (resolve-interface '\''(guix-package)) '\'guix-package')'
-exec address@hidden@} -L "@guilemoduledir@" -l "$0" \
- -c "(apply $main (cdr (command-line)))" "$@"
+startup="
+(let ()
+ (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+ (define (main interpreter module-dir script-file . args)
+ (unless (getenv \"GUIX_UNINSTALLED\")
+ (push! module-dir %load-path)
+ (push! module-dir %load-compiled-path))
+ (load script-file)
+ (let ((proc (module-ref (resolve-interface '($script))
+ '$script)))
+ (apply proc args)))
+ (apply main (command-line)))
+"
+exec "address@hidden@}" -c "$startup" "@guilemoduledir@" "$0" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 1dc63cd..5349c4c 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -43,7 +43,12 @@ export NIX_ROOT_FINDER NIX_SETUID_HELPER
# auto-compilation.
NIX_HASH="@NIX_HASH@"
-
export NIX_HASH
+# Define $GUIX_UNINSTALLED to prevent `guix-package' and other scripts from
+# prepending @guilemoduledir@ to the Guile load paths.
+
+GUIX_UNINSTALLED=1
+export GUIX_UNINSTALLED
+
exec "$@"
--
1.7.10.4
- [PATCH] Improve shell script headers and pre-inst-env handling, Mark H Weaver, 2013/02/11
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Mark H Weaver, 2013/02/11
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Ludovic Courtès, 2013/02/12
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Mark H Weaver, 2013/02/12
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Mark H Weaver, 2013/02/13
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Ludovic Courtès, 2013/02/13
- Re: [PATCH] Improve shell script headers and pre-inst-env handling, Mark H Weaver, 2013/02/14
- [PATCH] Replace individual scripts with master 'guix' script, Mark H Weaver, 2013/02/14