From 81bc69df73d20c5c4d0e1ccc77255c0c6c118abc Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Mon, 30 Nov 2020 16:40:37 +0100
Subject: dune: Don't echo "$(pwd)" when creating the shims

AFAICT `echo "$(pwd)"` is unsound for the dune cache when called from
different paths (typically different git worktrees).
---
 dev/shim/dune | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'dev')

diff --git a/dev/shim/dune b/dev/shim/dune
index 84b2e642e8..8006c629ed 100644
--- a/dev/shim/dune
+++ b/dev/shim/dune
@@ -7,7 +7,7 @@
   (with-stdout-to coqtop-prelude
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqtop} -coqlib $(pwd)/%{project_root}\" \\$@")
+    (bash "echo '$(dirname $0)/%{bin:coqtop} -coqlib $(dirname $0)/%{project_root}' \\$@")
     (run chmod +x %{targets})))))
 
 (rule
@@ -19,7 +19,7 @@
   (with-stdout-to coqc-prelude
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqc} -coqlib $(pwd)/%{project_root}\" \\$@")
+    (bash "echo '$(dirname $0)/%{bin:coqc} -coqlib $(dirname $0)/%{project_root}' \\$@")
     (run chmod +x %{targets})))))
 
 (rule
@@ -32,7 +32,7 @@
   (with-stdout-to %{targets}
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqtop.byte} -coqlib $(pwd)/%{project_root}\" \\$@")
+    (bash "echo '$(dirname $0)/%{bin:coqtop.byte} -coqlib $(dirname $0)/%{project_root}' \\$@")
     (run chmod +x %{targets})))))
 
 (rule
@@ -48,5 +48,5 @@
   (with-stdout-to coqide-prelude
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqide} -coqlib $(pwd)/%{project_root}\" \\$@")
+    (bash "echo '$(dirname $0)/%{bin:coqide} -coqlib $(dirname $0)/%{project_root}' \\$@")
     (run chmod +x %{targets})))))
-- 
cgit v1.2.3