diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-08-19 21:50:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-08-19 23:04:03 +0200 |
| commit | 525a59d6d3278f891e19c85cdad96175cffcdef7 (patch) | |
| tree | 6a40c3765f487d91a481f57e83638af813ee80ef | |
| parent | 54ba617e9ff07482e81d9e265caeb786cf8cefeb (diff) | |
| download | patches-525a59d6d3278f891e19c85cdad96175cffcdef7.tar patches-525a59d6d3278f891e19c85cdad96175cffcdef7.tar.gz | |
utils: Add a `path' argument to `patch-shebang'.
* guix/build/utils.scm (patch-shebang): Add an optional `path'
parameter. Change SHEBANG-RX to match the whole interpreter file
name. Don't patch when BIN and CMD are the same. Add docstring.
| -rw-r--r-- | guix/build/utils.scm | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm index fbffa8ba43..7e572c0388 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -255,10 +255,12 @@ match substring." (loop (get-bytevector-n! in buffer 0 buffer-size)))))) (define patch-shebang - (let ((shebang-rx (make-regexp "^[[:blank:]]*([[:graph:]]*)/([[:alnum:]]+)(.*)$"))) - (lambda (file) - "Patch the #! interpreter path in FILE, if FILE actually starts with a -shebang." + (let ((shebang-rx (make-regexp "^[[:blank:]]*([[:graph:]]+)(.*)$"))) + (lambda* (file + #:optional (path (search-path-as-string->list (getenv "PATH")))) + "Replace the #! interpreter file name in FILE by a valid one found in +PATH, when FILE actually starts with a shebang. Return #t when FILE was +patched, #f otherwise." (define (patch p interpreter rest-of-line) (let* ((template (string-append file ".XXXXXX")) (out (mkstemp! template)) @@ -287,21 +289,21 @@ shebang." (let ((line (false-if-exception (read-line p)))) (and=> (and line (regexp-exec shebang-rx line)) (lambda (m) - (let* ((PATH - (search-path-as-string->list (getenv "PATH"))) - (cmd (match:substring m 2)) - (bin (search-path PATH cmd))) + (let* ((cmd (match:substring m 1)) + (bin (search-path path + (basename cmd)))) (if bin - (begin - (format (current-error-port) - "patch-shebang: ~a: changing `~a/~a' to `~a'~%" - file (match:substring m 1) - cmd bin) - (patch p bin (match:substring m 3))) + (if (string=? bin cmd) + #f ; nothing to do + (begin + (format (current-error-port) + "patch-shebang: ~a: changing `~a' to `~a'~%" + file cmd bin) + (patch p bin (match:substring m 2)))) (begin (format (current-error-port) "patch-shebang: ~a: warning: no binary for interpreter `~a' found in $PATH~%" - file cmd) + file (basename cmd)) #f))))))))))))) ;;; Local Variables: |