rebuild

perlbrew

@@ -422,7 +422,12 @@ $fatpacked{"App/Perlbrew/Util.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".
   
   use Exporter 'import';
   our @EXPORT = qw( uniq min editdist files_are_the_same perl_version_to_integer );
-  our @EXPORT_OK = qw( find_similar_tokens looks_like_url_of_skaji_relocatable_perl );
+  our @EXPORT_OK = qw(
+      find_similar_tokens
+      looks_like_url_of_skaji_relocatable_perl
+      looks_like_sys_would_be_compatible_with_skaji_relocatable_perl
+      make_skaji_relocatable_perl_url
+  );
   
   sub uniq {
       my %seen;
@@ -531,6 +536,37 @@ $fatpacked{"App/Perlbrew/Util.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".
       };
   }
   
+  
+  sub _arch_compat {
+      my ($arch) = @_;
+      my $compat = {
+          x86_64 => "amd64"
+      };
+      return $compat->{$arch} || $arch;
+  }
+  
+  sub looks_like_sys_would_be_compatible_with_skaji_relocatable_perl {
+      my ($detail, $sys) = @_;
+  
+      return (
+          ($detail->{os} eq $sys->os)
+          && (_arch_compat($detail->{arch}) eq _arch_compat($sys->arch))
+      );
+  }
+  
+  sub make_skaji_relocatable_perl_url {
+      my ($str, $sys) = @_;
+      if ($str =~ m/\Askaji-relocatable-perl-(5\.[0-9][0-9]\.[0-9][0-9]?.[0-9])\z/) {
+          my $version = $1;
+          my $os = $sys->os;
+          my $arch = $sys->arch;
+          $arch = "amd64" if $arch eq 'x86_64';
+  
+          return "https://github.com/skaji/relocatable-perl/releases/download/$version/perl-$os-$arch.tar.gz";
+      }
+      return undef;
+  }
+  
   1;
 APP_PERLBREW_UTIL
 
@@ -561,7 +597,7 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
   use File::Copy qw( copy move );
   use Capture::Tiny ();
   
-  use App::Perlbrew::Util qw( files_are_the_same uniq find_similar_tokens looks_like_url_of_skaji_relocatable_perl );
+  use App::Perlbrew::Util qw( files_are_the_same uniq find_similar_tokens looks_like_url_of_skaji_relocatable_perl looks_like_sys_would_be_compatible_with_skaji_relocatable_perl make_skaji_relocatable_perl_url );
   use App::Perlbrew::Path ();
   use App::Perlbrew::Path::Root ();
   use App::Perlbrew::HTTP qw( http_download http_get );
@@ -1767,8 +1803,16 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
           exit(-1);
       }
   
+      if ( my $url = make_skaji_relocatable_perl_url($dist, $self->sys) ) {
+          return $self->run_command_install($url);
+      }
+  
       if ( my $detail = looks_like_url_of_skaji_relocatable_perl($dist) ) {
-          return $self->do_install_skaji_relocatable_perl($detail);
+          if (looks_like_sys_would_be_compatible_with_skaji_relocatable_perl($detail, $self->sys)) {
+              return $self->do_install_skaji_relocatable_perl($detail);
+          } else {
+              die "ERROR: The given url points to a tarball for different os/arch.\n";
+          }
       }
   
       $self->{dist_name} = $dist;    # for help msg generation, set to non