From 01155b1808b17f0a4f54388261ab0c6f5fee2f1b Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Sun, 28 Apr 2013 16:08:23 +0000 Subject: utils: Adjust 'wrap-program'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/utils.scm (wrap-program): Fix computation of PROG-REAL and PROG-TMP when PROG is an absolute file name. Add "$@" in the generated script, and quote PROG-REAL. Signed-off-by: Ludovic Courtès --- guix/build/utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'guix/build') diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 356dd46b52..a4a82a5f8c 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -680,8 +680,8 @@ (define* (wrap-program prog #:rest vars) This is useful for scripts that expect particular programs to be in $PATH, for programs that expect particular shared libraries to be in $LD_LIBRARY_PATH, or modules in $GUILE_LOAD_PATH, etc." - (let ((prog-real (string-append "." prog "-real")) - (prog-tmp (string-append "." prog "-tmp"))) + (let ((prog-real (string-append (dirname prog) "/." (basename prog) "-real")) + (prog-tmp (string-append (dirname prog) "/." (basename prog) "-tmp"))) (define (export-variable lst) ;; Return a string that exports an environment variable. (match lst @@ -709,7 +709,7 @@ (define (export-variable lst) (with-output-to-file prog-tmp (lambda () (format #t - "#!~a~%~a~%exec ~a~%" + "#!~a~%~a~%exec \"~a\" \"$@\"~%" (which "bash") (string-join (map export-variable vars) "\n") -- cgit v1.2.3