From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Jul 2020 17:41:01 +0000 (+0100)
Subject: nailing-cargo: Record $base_path from linking goose-hunting
X-Git-Tag: nailing-cargo/1.0.0~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c6f681a6fa3fb0b805208749ab4352fa74c841fd;p=nailing-cargo.git

nailing-cargo: Record $base_path from linking goose-hunting

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

diff --git a/nailing-cargo b/nailing-cargo
index 806f7bd..22d5dd5 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -39,6 +39,7 @@ use Types::Serialiser;
 use File::Glob qw(bsd_glob GLOB_ERR GLOB_BRACE GLOB_NOMAGIC);
 use Cwd qw(realpath);
 
+our $base_path;
 our %archmap = (
     RPI => 'arm-unknown-linux-gnueabihf',
 );
@@ -46,6 +47,7 @@ our %archmap = (
 BEGIN {
   $self = $0;  $self =~ s{^.*/(?=.)}{};
   my $deref = $0;
+  our $base_path;
   while ($deref =~ m{^/}) {
     my $link = readlink $deref;
     if (!defined $link) {
@@ -53,6 +55,7 @@ BEGIN {
 	or die "$self: checking our script location $deref: $!\n";
       $deref =~ s{/[^/]+$}{}
 	or die "$self: unexpected script path: $deref\n";
+      $base_path = $deref;
       unshift @INC, $deref."/TOML-Tiny/lib";
       last;
     }