From 67188df256a91d9735755bfc9cbbe4929ff5687f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 May 2020 00:33:10 +0100 Subject: [PATCH] nailing-cargo: Bugfixes etc. Signed-off-by: Ian Jackson --- nailing-cargo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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~"; -- 2.30.2