X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flocal%2Flib.pm;h=f1a6dd682dede888021ad82a7d57c3777c73c7f6;hb=f39aa2f9253fa8a04a286d37bb55fa704c2e806c;hp=d65df50c07d6fc5451deae0c5911f65f04679ffa;hpb=fc5f07c3c4e0726a494fc6c6199a627bf43b8dfb;p=p5sagit%2Flocal-lib.git

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index d65df50..f1a6dd6 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -109,6 +109,8 @@ sub _as_list {
 }
 sub _remove_from {
   my ($list, @remove) = @_;
+  return @$list
+    if !@remove;
   my %remove = map { $_ => 1 } @remove;
   grep !$remove{$_}, _as_list($list);
 }
@@ -205,15 +207,18 @@ sub deactivate_all {
 
   my @active_lls = $self->active_paths;
 
-  my %args = (
-    bins => [ _remove_from($self->bins,
-      map $self->install_base_bin_path($_), @active_lls) ],
-    libs => [ _remove_from($self->libs,
-      map $self->install_base_perl_path($_), @active_lls) ],
-    inc => [ _remove_from($self->inc,
-      map $self->lib_paths_for($_), @active_lls) ],
-    roots => [ _remove_from($self->roots, @active_lls) ],
-  );
+  my %args;
+  if (@active_lls) {
+    %args = (
+      bins => [ _remove_from($self->bins,
+        map $self->install_base_bin_path($_), @active_lls) ],
+      libs => [ _remove_from($self->libs,
+        map $self->install_base_perl_path($_), @active_lls) ],
+      inc => [ _remove_from($self->inc,
+        map $self->lib_paths_for($_), @active_lls) ],
+      roots => [ _remove_from($self->roots, @active_lls) ],
+    );
+  }
 
   $args{extra} = $self->installer_options_for(undef);
 
@@ -227,18 +232,24 @@ sub activate {
   $self->ensure_dir_structure_for($path)
     unless $self->no_create;
 
+  $path = ( Win32::GetShortPathName($path) || $path )
+    if $^O eq 'MSWin32';
+
   my @active_lls = $self->active_paths;
 
-  if (grep { $_ eq $path } @active_lls) {
+  if (grep { $_ eq $path } @active_lls[1 .. $#active_lls]) {
     $self = $self->deactivate($path);
   }
 
-  my %args = (
-    bins  => [ $self->install_base_bin_path($path), @{$self->bins} ],
-    libs  => [ $self->install_base_perl_path($path), @{$self->libs} ],
-    inc   => [ $self->lib_paths_for($path), @{$self->inc} ],
-    roots => [ $path, @{$self->roots} ],
-  );
+  my %args;
+  if (!@active_lls || $active_lls[0] ne $path) {
+    %args = (
+      bins  => [ $self->install_base_bin_path($path), @{$self->bins} ],
+      libs  => [ $self->install_base_perl_path($path), @{$self->libs} ],
+      inc   => [ $self->lib_paths_for($path), @{$self->inc} ],
+      roots => [ $path, @{$self->roots} ],
+    );
+  }
 
   $args{extra} = $self->installer_options_for($path);
 
@@ -310,8 +321,12 @@ sub environment_vars_string_for {
         && ${$value->[0]} eq $name) {
       next;
     }
-    if (!ref $value
-        && $value eq $ENV{$name}) {
+    if (
+        !ref $value
+        and defined $value
+          ? (defined $ENV{$name} && $value eq $ENV{$name})
+          : !defined $ENV{$name}
+    ) {
       next;
     }
     $out .= $self->$build_method($name, $value);
@@ -322,42 +337,36 @@ sub environment_vars_string_for {
 sub build_bourne_env_declaration {
   my ($class, $name, $args) = @_;
   my $value = $class->_interpolate($args);
-  $value =~ s/"/\\"/g
-    if defined $value;
-  return defined($value) ? qq{export ${name}="${value}"\n} : qq{unset ${name}\n};
+  defined $value
+    ? qq{export ${name}="${value}";\n}
+    : qq{unset ${name};\n};
 }
 sub build_csh_env_declaration {
   my ($class, $name, $args) = @_;
-  my ($value, @vars) = $class->_interpolate($args);
-  @vars = grep { $_ ne $name || defined $value } @vars;
-  $value =~ s/"/"\\""/g
-    if defined $value;
-  join '',
-    (map qq{if ! \$?$_ setenv $_ "";\n}, @vars),
-    (defined($value)
+  my ($value, @vars) = $class->_interpolate($args, undef, undef, '"', qq{"\\"});
+  (join '', map qq{if ! \$?$_ setenv $_ "";\n}, @vars)
+    . defined $value
       ? qq{setenv $name "$value";\n}
-      : qq{unsetenv $name;\n});
+      : qq{unsetenv $name;\n};
 }
 sub build_cmd_env_declaration {
   my ($class, $name, $args) = @_;
-  my $value = $class->_interpolate($args, '%', '%');
-  $value =~ s/"/\\"/g
-    if defined $value;
-  return qq{set $name=} . (defined($value) ? qq{"$value"} : '') . "\n";
+  my $value = $class->_interpolate($args, '%', '%', qr([()!^"<>&|]), '^');
+  defined $value
+    ? qq{set $name=$value\n}
+    : qq{set $name=\n};
 }
 sub build_powershell_env_declaration {
   my ($class, $name, $args) = @_;
-  my $value = $class->_interpolate($args, '$env:');
-  if (defined $value) {
-    $value =~ s/"/\\"/g;
-    return qq{\$env:$name = "$value"\n};
-  }
-  return "Remove-Item Env:\\$name\n";
+  my $value = $class->_interpolate($args, '$env:', '', '"', '`');
+  defined $value
+    ? qq{\$env:$name = "$value"\n}
+    : "Remove-Item Env:\\$name\n";
 }
 
 
 sub _interpolate {
-  my ($class, $args, $start, $end) = @_;
+  my ($class, $args, $start, $end, $escape, $escape_char) = @_;
   return
     unless defined $args;
   return $args
@@ -366,10 +375,19 @@ sub _interpolate {
     unless @$args;
   $start = '$' unless defined $start;
   $end = '' unless defined $end;
+  $escape = '"' unless defined $escape;
+  $escape_char = "\\" unless defined $escape_char;
   my @vars;
   my $string = join($Config{path_sep}, map {
-    (ref $_ && ref $_ eq 'SCALAR') ? do { push @vars, $$_; $start.$$_.$end }
-      : $_
+    if (ref $_ && ref $_ eq 'SCALAR') {
+      push @vars, $$_;
+      $start.$$_.$end;
+    }
+    else {
+      my $str = $_;
+      $str =~ s/($escape)/$escape_char$1/g;
+      $str;
+    }
   } @$args);
   return wantarray ? ($string, @vars) : $string;
 }
@@ -416,9 +434,6 @@ sub resolve_path {
     resolve_empty_path
   )}($path);
 
-  $path = Win32::GetShortPathName($path)
-    if $^O eq 'MSWin32';
-
   $path;
 }