Navigation Menu

Skip to content

Commit

Permalink
use $*EXECUTABLE_NAME instead of hard-coded 'perl6'
Browse files Browse the repository at this point in the history
Because we now have perl6-p and perl6-j binaries.
  • Loading branch information
FROGGS committed Nov 19, 2013
1 parent 9f2591b commit 8375930
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bootstrap.pl
Expand Up @@ -44,7 +44,7 @@ BEGIN
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib";
%*ENV<PERL6LIB> ~= "{$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
Expand Down
6 changes: 3 additions & 3 deletions rebootstrap.pl
Expand Up @@ -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;
}

Expand All @@ -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;

0 comments on commit 8375930

Please sign in to comment.