Skip to content

Commit

Permalink
regen
Browse files Browse the repository at this point in the history
  • Loading branch information
gugod committed Nov 3, 2011
1 parent 6a56085 commit 3dc4673
Showing 1 changed file with 10 additions and 19 deletions.
29 changes: 10 additions & 19 deletions perlbrew
Expand Up @@ -14,7 +14,7 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
use File::Path::Tiny;
use FindBin;
our $VERSION = "0.30";
our $VERSION = "0.31";
our $CONFIG;
our $PERLBREW_ROOT = $ENV{PERLBREW_ROOT} || "$ENV{HOME}/perl5/perlbrew";
Expand Down Expand Up @@ -974,26 +974,10 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
name => $name,
version => $self->format_perl_version(`$executable -e 'print \$]'`),
is_current => ($self->current_perl eq $name) && !$self->env("PERLBREW_LIB"),
is_external => 0,
libs => [ $self->local_libs($name) ]
};
}
my $current_perl_executable = `which perl`;
$current_perl_executable =~ s/\n$//;
my $current_perl_executable_version;
for ( grep { -f $_ && -x $_ } uniq map { s/\/+$//; "$_/perl" } split(":", $self->env('PATH')) ) {
$current_perl_executable_version =
$self->format_perl_version(`$_ -e 'print \$]'`);
push @result, {
name => $_,
version => $current_perl_executable_version,
is_current => $current_perl_executable && ($_ eq $current_perl_executable),
is_external => 1
} unless index($_, $self->root) == 0;
}
return @result;
}
Expand Down Expand Up @@ -1023,8 +1007,8 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
sub is_installed {
my ($self, $name) = @_;
my @installed = grep { !$_->{is_external} } $self->installed_perls;
return grep { $name eq $_->{name} } @installed;
return grep { $name eq $_->{name} } $self->installed_perls;
}
# Return a hash of PERLBREW_* variables
Expand Down Expand Up @@ -1415,8 +1399,15 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
sub run_command_exec {
my $self = shift;
my @args = @{$self->{original_argv}};
if ($args[0] eq '--root') {
shift @args;
shift @args;
}
shift @args;
for my $i ( $self->installed_perls ) {
next if -l $self->root . '/perls/' . $i->{name}; # Skip Aliases
my %env = $self->perlbrew_env($i->{name});
Expand Down

0 comments on commit 3dc4673

Please sign in to comment.