remove / rewrite the code that depends on the 'current' symlink.

gugod · May 9, 2011 · 6e1c321 · 6e1c321
1 parent 9eb2848
commit 6e1c321
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/App/perlbrew.pm b/lib/App/perlbrew.pm
@@ -732,7 +732,6 @@ sub format_perl_version {
 
 sub installed_perls {
     my $self    = shift;
-    my $current = readlink("$ROOT/perls/current");
 
     my @result;
 
@@ -742,7 +741,7 @@ sub installed_perls {
         push @result, { name => $name, is_current => (current_perl eq $name) };
     }
 
-    my $current_perl_executable = readlink("$ROOT/bin/perl") || `which perl`;
+    my $current_perl_executable = `which perl`;
     $current_perl_executable =~ s/\n$//;
 
     my $current_perl_executable_version;
@@ -774,9 +773,9 @@ sub perlbrew_env {
             $env{PERLBREW_PATH} .= ":$ROOT/perls/$perl/bin";
         }
     }
-    elsif (-d "$ROOT/perls/current/bin") {
-        $env{PERLBREW_PERL} = readlink("$ROOT/perls/current");
-        $env{PERLBREW_PATH} .= ":$ROOT/perls/current/bin";
+    elsif ( $self->env("PERLBREW_PERL") ) {
+        $env{PERLBREW_PERL} = $self->env("PERLBREW_PERL");
+        $env{PERLBREW_PATH} .= ":$ROOT/perls/$env{PERLBREW_PERL}/bin";
     }
 
     return %env;

diff --git a/perlbrew b/perlbrew
@@ -734,7 +734,6 @@ sub format_perl_version {
 
 sub installed_perls {
     my $self    = shift;
-    my $current = readlink("$ROOT/perls/current");
 
     my @result;
 
@@ -744,7 +743,7 @@ sub installed_perls {
         push @result, { name => $name, is_current => (current_perl eq $name) };
     }
 
-    my $current_perl_executable = readlink("$ROOT/bin/perl") || `which perl`;
+    my $current_perl_executable = `which perl`;
     $current_perl_executable =~ s/\n$//;
 
     my $current_perl_executable_version;
@@ -776,9 +775,9 @@ sub perlbrew_env {
             $env{PERLBREW_PATH} .= ":$ROOT/perls/$perl/bin";
         }
     }
-    elsif (-d "$ROOT/perls/current/bin") {
-        $env{PERLBREW_PERL} = readlink("$ROOT/perls/current");
-        $env{PERLBREW_PATH} .= ":$ROOT/perls/current/bin";
+    elsif ( $self->env("PERLBREW_PERL") ) {
+        $env{PERLBREW_PERL} = $self->env("PERLBREW_PERL");
+        $env{PERLBREW_PATH} .= ":$ROOT/perls/$env{PERLBREW_PERL}/bin";
     }
 
     return %env;
@@ -1054,6 +1053,7 @@ perlbrew - Perl Environment manager.
         install        Install perl
         list           List installed perls
         use            Use the specified perl in current shell
+        available      List perls available to install
         switch         Permanently use the specified perl as default
         mirror         Pick a preferred mirror site
         off            Permanently turn off perlbrew