From 9d7cc43b251061b15dbd70f0fe45696ec7b55f2e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:12:00 -0400 Subject: [PATCH 3/7] gnu: docker: Harmonize LookPath regexes. * gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at the start of the word, like it's done later. --- gnu/packages/docker.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 10aa3aa5b4..ce9d4d4643 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -375,7 +375,7 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.LookPath\\(\"" + ((#,(string-append "\\datum #'source-text) "\")")) @@ -389,11 +389,12 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.Command\\(\"" + ((#,(string-append "\\<(re)?exec\\.Command\\(\"" (syntax->datum #'source-text) - "\"")) - (string-append "exec.Command(\"" + "\"") _ re?) + (string-append (if re? re? "") + "exec.Command(\"" (assoc-ref inputs package) relative-path "\"")))))))) -- 2.20.1