about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2025-04-23 02:03:52 +0100
committerArun Isaac2025-04-23 02:04:38 +0100
commit6e499945abf03d928f56ad629d5aa6853ab4cdc5 (patch)
treeb4642a93fb17b3a450cc83f03775eae90b4f600a
parent5ea63c633e218706d945708d85e0f4c9d94de813 (diff)
downloadravanan-6e499945abf03d928f56ad629d5aa6853ab4cdc5.tar.gz
ravanan-6e499945abf03d928f56ad629d5aa6853ab4cdc5.tar.lz
ravanan-6e499945abf03d928f56ad629d5aa6853ab4cdc5.zip
command-line-tool: Strip store hash when copying out of the store.
Without stripping the hashes, the primary and secondary files have
different hash prefixes. This interferes with successful command
execution.

* ravanan/command-line-tool.scm (copy-input-files-gexp): Strip store
hash when copying files out of the store into the temporary inputs
directory. Update basename, nameroot and nameext accordingly.
-rw-r--r--ravanan/command-line-tool.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm
index ce4bdbc..c47bb3c 100644
--- a/ravanan/command-line-tool.scm
+++ b/ravanan/command-line-tool.scm
@@ -493,7 +493,7 @@ The returned G-expression will reference an @code{inputs-directory} variable."
      ((eq? (object-type input)
            'File)
       #~,(let ((path-in-inputs-directory
-                (expand-file-name #$(assoc-ref input "basename")
+                (expand-file-name #$(store-item-name (assoc-ref input "path"))
                                   inputs-directory)))
            (copy-file #$(assoc-ref input "path")
                       path-in-inputs-directory)
@@ -502,6 +502,12 @@ The returned G-expression will reference an @code{inputs-directory} variable."
                    (just path-in-inputs-directory))
              (cons "path"
                    (just path-in-inputs-directory))
+             (cons "basename"
+                   (just (basename path-in-inputs-directory)))
+             (cons "nameroot"
+                   (just (file-name-stem path-in-inputs-directory)))
+             (cons "nameext"
+                   (just (file-name-extension path-in-inputs-directory)))
              (cons "secondaryFiles"
                    #$(from-maybe
                       (maybe-let* ((secondary-files