my $shell = defined $1 ? $1 : shift @args;
$opts{shelltype} = $shell;
}
+ elsif ( $arg eq '--no-create' ) {
+ $opts{no_create} = 1;
+ }
elsif ( $arg =~ /^--/ ) {
die "Unknown import argument: $arg";
}
sub roots { $_[0]->{roots} ||= [ \'PERL_LOCAL_LIB_ROOT' ] }
sub extra { $_[0]->{extra} ||= {} }
sub shelltype { $_[0]->{shelltype} ||= $_[0]->guess_shelltype }
+sub no_create { $_[0]->{no_create} }
my $_archname = $Config{archname};
my $_version = $Config{version};
if (!grep { $_ eq $path } @active_lls) {
warn "Tried to deactivate inactive local::lib '$path'\n";
- return;
+ return $self;
}
my %args = (
my ($self, $path) = @_;
$self = $self->new unless ref $self;
$path = $self->resolve_path($path);
- $self->ensure_dir_structure_for($path);
+ $self->ensure_dir_structure_for($path)
+ unless $self->no_create;
my @active_lls = $self->active_paths;
&& ${$value->[0]} eq $name) {
next;
}
+ if (!ref $value
+ && $value eq $ENV{$name}) {
+ next;
+ }
$out .= $self->$build_method($name, $value);
}
return $out;
=cut
sub guess_shelltype {
- my $shellbin = 'sh';
- if(defined $ENV{'SHELL'}) {
- my @shell_bin_path_parts = File::Spec->splitpath($ENV{'SHELL'});
- $shellbin = $shell_bin_path_parts[-1];
- }
- my $shelltype = do {
- local $_ = $shellbin;
- if(/csh/) {
- 'csh'
- } else {
- 'bourne'
- }
- };
-
- # Both Win32 and Cygwin have $ENV{COMSPEC} set.
- if (defined $ENV{'COMSPEC'} && $^O ne 'cygwin') {
- my @shell_bin_path_parts = File::Spec->splitpath($ENV{'COMSPEC'});
- $shellbin = $shell_bin_path_parts[-1];
- $shelltype = do {
- local $_ = $shellbin;
- if(/command\.com/) {
- 'cmd'
- } elsif(/cmd\.exe/) {
- 'cmd'
- } elsif(/4nt\.exe/) {
- 'cmd'
- } else {
- $shelltype
- }
- };
+ my $shellbin
+ = defined $ENV{SHELL}
+ ? (File::Spec->splitpath($ENV{SHELL}))[-1]
+ : ( $^O eq 'MSWin32' && exists $ENV{'!EXITCODE'} )
+ ? 'bash'
+ : ( $^O eq 'MSWin32' && $ENV{PROMPT} && $ENV{COMSPEC} )
+ ? (File::Spec->splitpath($ENV{COMSPEC}))[-1]
+ : ( $^O eq 'MSWin32' && !$ENV{PROMPT} )
+ ? 'powershell.exe'
+ : 'sh';
+
+ for ($shellbin) {
+ return
+ /csh/ ? 'csh'
+ : /command\.com/ ? 'cmd'
+ : /cmd\.exe/ ? 'cmd'
+ : /4nt\.exe/ ? 'cmd'
+ : /powershell\.exe/ ? 'powershell'
+ : 'bourne';
}
- return $shelltype;
}
1;
Remove all directories that were added to search paths by C<local::lib> from the
search paths.
+=head2 --shelltype
+
+Specify the shell type to use for output. By default, the shell will be
+detected based on the environment. Should be one of: C<bourne>, C<csh>,
+C<cmd>, or C<powershell>.
+
+=head2 --no-create
+
+Prevents C<local::lib> from creating directories when activating dirs. This is
+likely to cause issues on Win32 systems.
+
=head1 METHODS
=head2 ensure_dir_structure_for
=over 4
-=item Arguments: $path, $interpolate
+=item Arguments: $path
=item Return value: %environment_vars