From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 12 Mar 2020 00:49:26 +0000 (+0000)
Subject: Make path = be absolute
X-Git-Tag: nailing-cargo/1.0.0~244
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e2450707d3397bc42759280a841edca188273bd;p=nailing-cargo.git

Make path = be absolute

This makes it work for crates in subdirectories

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index fd1fea0..1cc6138 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -56,7 +56,7 @@ while read <&204 what where; do
 	qwhere="${where//\//\\/}"
 	sed+='
 		s/^'$what' *= *\(\".*\"\) *$/'$what' = { version = \1 }/;
-		s/^'$what' *= *{/'$what' = { path = "..\/'"${qwhere}"'", /;
+		s#^'$what' *= *{#'$what' = { path = "'"${PWD%/*}"'/'"${qwhere}"'", #;
 		/^'$what' *=/ s/version *= *\"[^"]*\"//;
 		/^'$what' *=/ s/, *\([,}]\)/\1/;
 	'