From 837593022d4347b4ca49625b5b0130566697b923 Mon Sep 17 00:00:00 2001 From: Tobias Leich Date: Tue, 19 Nov 2013 19:57:55 +0100 Subject: [PATCH] use $*EXECUTABLE_NAME instead of hard-coded 'perl6' Because we now have perl6-p and perl6-j binaries. --- bootstrap.pl | 2 +- rebootstrap.pl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.pl b/bootstrap.pl index e8356e1..393abaf 100755 --- a/bootstrap.pl +++ b/bootstrap.pl @@ -44,7 +44,7 @@ BEGIN %*ENV ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib"; %*ENV ~= "{$env_sep}{cwd}/lib"; -shell "perl6 bin/panda install File::Find Shell::Command JSON::Tiny {cwd}"; +shell "$*EXECUTABLE_NAME bin/panda install File::Find Shell::Command JSON::Tiny {cwd}"; if "$destdir/panda/src".IO ~~ :d { rm_rf "$destdir/panda/src"; # XXX This shouldn't be necessary, I think # that src should not be kept at all, but diff --git a/rebootstrap.pl b/rebootstrap.pl index ca39945..e06bad6 100755 --- a/rebootstrap.pl +++ b/rebootstrap.pl @@ -19,7 +19,7 @@ BEGIN if not $state-file.defined { say "No need to rebootstrap, running normal bootstrap"; - shell 'perl6 bootstrap.pl'; + shell "$*EXECUTABLE_NAME bootstrap.pl"; exit 0; } @@ -44,9 +44,9 @@ BEGIN # and reinstall all manually-installed modules rm_rf "$prefix/lib"; rm_rf "$prefix/panda"; -shell 'perl6 bootstrap.pl'; +shell "$*EXECUTABLE_NAME bootstrap.pl"; say "==> Reinstalling @modules[]"; -shell "perl6 bin/panda install @modules[]"; +shell "$*EXECUTABLE_NAME bin/panda install @modules[]"; # Save the backup state file back to $prefix/panda/ spurt "$state-file.bak", $old-state if $old-state;