Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
pass on args transparently in runners created by CUR::Installation
So a '-h' that we want topass along won't mutate into '--h=True'.
cdc++ for reporting.
  • Loading branch information
FROGGS committed Apr 8, 2015
1 parent d6b1447 commit 730db2e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/core/CompUnitRepo/Local/Installation.pm
Expand Up @@ -33,7 +33,10 @@ __END__
:endofperl
';
my $perl_wrapper = '#!/usr/bin/env #perl#
sub MAIN(:$name, :$auth, :$ver, *@pos, *%named) {
sub MAIN(:$name, :$auth, :$ver, *@, *%) {
shift @*ARGS if $name;
shift @*ARGS if $auth;
shift @*ARGS if $ver;
my @installations = @*INC.grep(CompUnitRepo::Local::Installation);
my @binaries = @installations>>.files(\'bin/#name#\', :$name, :$auth, :$ver);
unless +@binaries {
Expand All @@ -52,7 +55,7 @@ sub MAIN(:$name, :$auth, :$ver, *@pos, *%named) {
}
note \' \' ~ %caps.values.map({ sprintf(\'%-*s\', .[1], .[0]) }).join(\' | \');
for @binaries -> $dist {
note \' \' ~ %caps.kv.map( -> $k, $v { sprintf(\'%-*s\', $v.[1], $dist{$k}) } ).join(\' | \')
note \' \' ~ %caps.kv.map( -> $k, $v { sprintf(\'%-*s\', $v.[1], $dist{$k} // \'\') } ).join(\' | \')
}
}
else {
Expand All @@ -61,8 +64,7 @@ sub MAIN(:$name, :$auth, :$ver, *@pos, *%named) {
exit 1;
}
my $options = join(\' \', %named.map({\'--\' ~ .key ~ \'=\' ~ .value}), @pos);
exit shell("$*EXECUTABLE_NAME {@binaries[0]<files><bin/#name#>} $options").exit
exit shell("$*EXECUTABLE_NAME {@binaries[0]<files><bin/#name#>} @*ARGS[]").exit
}';

method install(:$dist!, *@files) {
Expand Down

0 comments on commit 730db2e

Please sign in to comment.