s/EXECUTABLE_NAME/EXECUTABLE/ (for GH #73)

This lets us use panda with a perl6 that isn't in the current path.
tadzik · Apr 12, 2014 · 78bb1e0 · 78bb1e0
1 parent 2693bbc
commit 78bb1e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bootstrap.pl b/bootstrap.pl
@@ -44,7 +44,7 @@ BEGIN
 %*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib";
 %*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/lib";
 
-shell "$*EXECUTABLE_NAME bin/panda install File::Find Shell::Command JSON::Tiny {cwd}";
+shell "$*EXECUTABLE 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/lib/Panda/Builder.pm b/lib/Panda/Builder.pm
@@ -86,7 +86,7 @@ method build($where) {
                 #    next;
                 #}
                 say "Compiling $file to {comptarget}";
-                shell("$*EXECUTABLE_NAME --target={comptarget} "
+                shell("$*EXECUTABLE --target={comptarget} "
                     ~ "--output=$dest $file")
                         or fail "Failed building $file";
             }

diff --git a/lib/Panda/Tester.pm b/lib/Panda/Tester.pm
@@ -5,7 +5,7 @@ method test($where, :$prove-command = 'prove') {
     indir $where, {
         if 't'.IO ~~ :d {
             withp6lib {
-                my $c = "$prove-command -e $*EXECUTABLE_NAME -r t/";
+                my $c = "$prove-command -e $*EXECUTABLE -r t/";
                 shell $c or fail "Tests failed";
             }
         }

diff --git 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 "$*EXECUTABLE_NAME bootstrap.pl";
+    shell "$*EXECUTABLE bootstrap.pl";
     exit 0;
 }
 
@@ -44,9 +44,9 @@ BEGIN
 # and reinstall all manually-installed modules
 rm_rf "$prefix/lib";
 rm_rf "$prefix/panda";
-shell "$*EXECUTABLE_NAME bootstrap.pl";
+shell "$*EXECUTABLE bootstrap.pl";
 say "==> Reinstalling @modules[]";
-shell "$*EXECUTABLE_NAME bin/panda install @modules[]";
+shell "$*EXECUTABLE bin/panda install @modules[]";
 
 # Save the backup state file back to $prefix/panda/
 spurt "$state-file.bak", $old-state if $old-state;