From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 May 2020 23:33:10 +0000 (+0100)
Subject: nailing-cargo: Bugfixes etc.
X-Git-Tag: nailing-cargo/1.0.0~230
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=67188df256a91d9735755bfc9cbbe4929ff5687f;p=nailing-cargo.git

nailing-cargo: Bugfixes etc.

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

diff --git a/nailing-cargo b/nailing-cargo
index 1b6a303..0d119a2 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -48,7 +48,7 @@ use File::Compare;
 my $self = $0;  $self =~ s{^.*/(?=.)}{};
 
 our $worksphere = getcwd() // die "$self: getcwd failed: $!\n";
-$worksphere =~ s{/[^/]+}{} or die "$self: cwd \`$worksphere' unsupported!\n";
+$worksphere =~ s{/[^/]+$}{} or die "$self: cwd \`$worksphere' unsupported!\n";
 our $lockfile = "../.nailing-cargo-sphere.lock";
 
 our @configs;
@@ -205,7 +205,7 @@ sub calculate () {
 		next unless $info;
 		$info = { } unless ref $info;
 		delete $info->{version};
-		$info->{path} = $packagemap{$p};
+		$info->{path} = $worksphere.'/'.$packagemap{$p};
 	    }
 	}
 	my $nailing = "$mf.nailing~";