Skip to content

Commit 09867b3

Browse files
gugodgugod
committed
properly quote the env output
1 parent 94f198b commit 09867b3

File tree

3 files changed

+164
-59
lines changed

3 files changed

+164
-59
lines changed

‎lib/App/perlbrew.pm

+19-17
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,18 @@ perlbrew () {
7878
(use)
7979
if [[ -z "$2" ]] ; then
8080
if [[ -z "$PERLBREW_PERL" ]] ; then
81-
echo "No version in use; defaulting to system"
81+
echo "Currently using system perl"
8282
else
83-
echo "Using $PERLBREW_PERL version"
83+
echo "Currently using $PERLBREW_PERL"
8484
fi
85-
elif [[ -x "$PERLBREW_ROOT/perls/$2/bin/perl" ]]; then
86-
eval $(command perlbrew $short_option env $2)
87-
__perlbrew_set_path
88-
elif [[ -x "$PERLBREW_ROOT/perls/perl-$2/bin/perl" ]]; then
89-
eval $(command perlbrew $short_option env "perl-$2")
90-
__perlbrew_set_path
9185
else
92-
echo "$2 is not installed" >&2
93-
exit_status=1
86+
code=$(command perlbrew env $2);
87+
if [ -z "$code" ]; then
88+
exit_status=1
89+
else
90+
eval $code
91+
__perlbrew_set_path
92+
fi
9493
fi
9594
;;
9695
@@ -964,15 +963,16 @@ sub perlbrew_env {
964963

965964
$env{PERLBREW_PATH} = "$base/bin:" . $env{PERLBREW_PATH};
966965
$env{PERLBREW_LIB} = $lib_name;
967-
$env{PERL5LIB} = $lib_env{PERL5LIB};
966+
$env{PERL_MM_OPT} = $lib_env{PERL_MM_OPT};
967+
$env{PERL_MB_OPT} = $lib_env{PERL_MB_OPT};
968+
$env{PERL5LIB} = $lib_env{PERL5LIB};
969+
$env{PERL_LOCAL_LIB_ROOT} = $lib_env{PERL_LOCAL_LIB_ROOT};
968970
}
969971
}
970-
elsif ( $self->env("PERLBREW_PERL") ) {
971-
$env{PERLBREW_PERL} = $self->env("PERLBREW_PERL");
972-
$env{PERLBREW_PATH} .= ":$PERLBREW_ROOT/perls/$env{PERLBREW_PERL}/bin";
972+
else {
973+
$env{PERLBREW_PERL} = "";
973974
}
974975

975-
976976
return %env;
977977
}
978978

@@ -1146,12 +1146,14 @@ sub run_command_env {
11461146

11471147
if ($self->env('SHELL') =~ /(ba|k|z|\/)sh$/) {
11481148
while (my ($k, $v) = each(%env)) {
1149-
print "export $k=$v\n";
1149+
$v =~ s/(\\")/\\$1/g if defined $v;
1150+
print "export $k=\"$v\"\n";
11501151
}
11511152
}
11521153
else {
11531154
while (my ($k, $v) = each(%env)) {
1154-
print "setenv $k $v\n";
1155+
$v =~ s/(\\")/\\$1/g if defined $v;
1156+
print "setenv $k \"$v\"\n";
11551157
}
11561158
}
11571159
}

‎perlbrew

+129-29
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,29 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
1010
use warnings;
1111
use 5.008;
1212
use Getopt::Long ();
13-
use File::Spec::Functions qw( catfile );
13+
use File::Spec::Functions qw( catfile catdir );
1414
use File::Path::Tiny;
1515
use Text::Levenshtein ();
1616
use FindBin;
1717
1818
our $VERSION = "0.29";
1919
our $CONF;
2020
21-
our $PERLBREW_ROOT ||= $ENV{PERLBREW_ROOT} || "$ENV{HOME}/perl5/perlbrew";
22-
our $PERLBREW_HOME ||= $ENV{PERLBREW_HOME} || "$ENV{HOME}/.perlbrew";
21+
our $PERLBREW_ROOT = $ENV{PERLBREW_ROOT} || "$ENV{HOME}/perl5/perlbrew";
22+
our $PERLBREW_HOME = $ENV{PERLBREW_HOME} || "$ENV{HOME}/.perlbrew";
2323
2424
my $CONF_FILE = catfile( $PERLBREW_ROOT, 'Conf.pm' );
25-
my $CURRENT_PERL = $ENV{PERLBREW_PERL};
2625
2726
local $SIG{__DIE__} = sub {
2827
my $message = shift;
2928
warn $message;
3029
exit 1;
3130
};
3231
33-
sub current_perl { $CURRENT_PERL || '' }
32+
sub current_perl {
33+
my ($self) = @_;
34+
return $self->env('PERLBREW_PERL') || ''
35+
}
3436
3537
sub BASHRC_CONTENT() {
3638
return "export PERLBREW_BASHRC_VERSION=$VERSION\n\n" . <<'RC';
@@ -83,19 +85,18 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
8385
(use)
8486
if [[ -z "$2" ]] ; then
8587
if [[ -z "$PERLBREW_PERL" ]] ; then
86-
echo "No version in use; defaulting to system"
88+
echo "Currently using system perl"
8789
else
88-
echo "Using $PERLBREW_PERL version"
90+
echo "Currently using $PERLBREW_PERL"
8991
fi
90-
elif [[ -x "$PERLBREW_ROOT/perls/$2/bin/perl" ]]; then
91-
eval $(command perlbrew $short_option env $2)
92-
__perlbrew_set_path
93-
elif [[ -x "$PERLBREW_ROOT/perls/perl-$2/bin/perl" ]]; then
94-
eval $(command perlbrew $short_option env "perl-$2")
95-
__perlbrew_set_path
9692
else
97-
echo "$2 is not installed" >&2
98-
exit_status=1
93+
code=$(command perlbrew env $2);
94+
if [ -z "$code" ]; then
95+
exit_status=1
96+
else
97+
eval $code
98+
__perlbrew_set_path
99+
fi
99100
fi
100101
;;
101102
@@ -913,7 +914,7 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
913914
push @result, {
914915
name => $name,
915916
version => $self->format_perl_version(`$executable -e 'print \$]'`),
916-
is_current => (current_perl eq $name),
917+
is_current => ($self->current_perl eq $name),
917918
is_external => 0
918919
};
919920
}
@@ -944,23 +945,39 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
944945
945946
# Return a hash of PERLBREW_* variables
946947
sub perlbrew_env {
947-
my ($self, $perl) = @_;
948+
my ($self, $name) = @_;
948949
949950
my %env = (
950951
PERLBREW_VERSION => $VERSION,
951952
PERLBREW_PATH => "$PERLBREW_ROOT/bin",
952953
PERLBREW_ROOT => $PERLBREW_ROOT
953954
);
954955
955-
if ($perl) {
956-
if(-d "$PERLBREW_ROOT/perls/$perl/bin") {
957-
$env{PERLBREW_PERL} = $perl;
958-
$env{PERLBREW_PATH} .= ":$PERLBREW_ROOT/perls/$perl/bin";
956+
if ($name) {
957+
my ($perl_name, $lib_name) = split("@", $name);
958+
$perl_name = $name unless $lib_name;
959+
960+
if(-d "$PERLBREW_ROOT/perls/$perl_name/bin") {
961+
$env{PERLBREW_PERL} = $perl_name;
962+
$env{PERLBREW_PATH} .= ":$PERLBREW_ROOT/perls/$perl_name/bin";
963+
}
964+
965+
if ($lib_name) {
966+
require local::lib;
967+
my $base = "$PERLBREW_HOME/libs/$name";
968+
969+
my %lib_env = local::lib->build_environment_vars_for($base, 0, 0);
970+
971+
$env{PERLBREW_PATH} = "$base/bin:" . $env{PERLBREW_PATH};
972+
$env{PERLBREW_LIB} = $lib_name;
973+
$env{PERL_MM_OPT} = $lib_env{PERL_MM_OPT};
974+
$env{PERL_MB_OPT} = $lib_env{PERL_MB_OPT};
975+
$env{PERL5LIB} = $lib_env{PERL5LIB};
976+
$env{PERL_LOCAL_LIB_ROOT} = $lib_env{PERL_LOCAL_LIB_ROOT};
959977
}
960978
}
961-
elsif ( $self->env("PERLBREW_PERL") ) {
962-
$env{PERLBREW_PERL} = $self->env("PERLBREW_PERL");
963-
$env{PERLBREW_PATH} .= ":$PERLBREW_ROOT/perls/$env{PERLBREW_PERL}/bin";
979+
else {
980+
$env{PERLBREW_PERL} = "";
964981
}
965982
966983
return %env;
@@ -1136,12 +1153,14 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
11361153
11371154
if ($self->env('SHELL') =~ /(ba|k|z|\/)sh$/) {
11381155
while (my ($k, $v) = each(%env)) {
1139-
print "export $k=$v\n";
1156+
$v =~ s/(\\")/\\$1/g if defined $v;
1157+
print "export $k=\"$v\"\n";
11401158
}
11411159
}
11421160
else {
11431161
while (my ($k, $v) = each(%env)) {
1144-
print "setenv $k $v\n";
1162+
$v =~ s/(\\")/\\$1/g if defined $v;
1163+
print "setenv $k \"$v\"\n";
11451164
}
11461165
}
11471166
}
@@ -1183,6 +1202,8 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
11831202
die "\nERROR: Failed to retrive cpanm executable.\n\n";
11841203
}
11851204
1205+
mkpath("$PERLBREW_ROOT/bin") unless -d "$PERLBREW_ROOT/bin";
1206+
11861207
open my $CPANM, '>', $out or die "cannot open file($out): $!";
11871208
print $CPANM $body;
11881209
close $CPANM;
@@ -1379,15 +1400,94 @@ $fatpacked{"App/perlbrew.pm"} = <<'APP_PERLBREW';
13791400
print CSHRC_CONTENT;
13801401
}
13811402
1403+
sub run_command_lib {
1404+
my ($self, $subcommand, @args) = @_;
1405+
unless ($subcommand) {
1406+
print <<'USAGE';
1407+
1408+
The 'lib' command can be used to manage multiple local::lib containers
1409+
inside different perls. Here are some a brief usage.
1410+
1411+
# Assuming perl-5.14.2 for the following examples.
1412+
perlbrew switch 5.14.2
1413+
1414+
# Create a local::lib folder named `nobita` inside current perl
1415+
perlbrew lib create nobita
1416+
1417+
# Create multiple local::lib folders in one command.
1418+
perlbrew lib create nobita shizuka naruto
1419+
1420+
# Get a list of local::lib folders
1421+
perlbrew lib list
1422+
1423+
# Create a local::lib folder named `shizuka` inside perl-5.12.3,
1424+
# ... without activating to perl-5.12.3 first.
1425+
perlbrew lib create perl-5.12.3@shizuka
1426+
1427+
# Activate perl-5.12.3, with the 'nobita' local::lib
1428+
perlbrew use perl-5.12.3@nobita
1429+
1430+
# Activate perl-5.14.2, with the 'nobita' local::lib
1431+
perlbrew use perl-5.14.2@nobita
1432+
1433+
# Make perl-5.14.2@nobita the default perl + local::lib setting for new shells.
1434+
perlbrew switch perl-5.14.2@nobita
1435+
1436+
# Remove libs, notice `shizuka` here means `perl-5.14.2@shizuka`
1437+
perlbrew lib remove perl-5.12.3@nobita shizuka
1438+
1439+
# Back to a local::lib-less state.
1440+
perlbrew switch perl-5.14.2
1441+
1442+
USAGE
1443+
return;
1444+
}
1445+
1446+
my $sub = "run_command_lib_$subcommand";
1447+
if ($self->can($sub)) {
1448+
$self->$sub( @args );
1449+
}
1450+
else {
1451+
print "Unknown command: $subcommand\n";
1452+
}
1453+
}
1454+
1455+
sub run_command_lib_create {
1456+
my ($self, $name) = @_;
1457+
1458+
my $fullname = $self->current_perl . '@' . $name;
1459+
mkpath( catdir($PERLBREW_HOME, "libs", $fullname) );
1460+
1461+
print "lib '$fullname' is created.\n"
1462+
unless $self->{quiet};
1463+
1464+
return;
1465+
}
1466+
1467+
sub run_command_lib_delete {
1468+
my ($self, $name) = @_;
1469+
1470+
my $fullname = $self->current_perl . '@' . $name;
1471+
rmpath( catdir($PERLBREW_HOME, "libs", $fullname) );
1472+
1473+
print "lib '$fullname' is deleted.\n"
1474+
unless $self->{quiet};
1475+
1476+
return;
1477+
}
1478+
13821479
sub resolve_installation_name {
13831480
my ($self, $name) = @_;
13841481
die "App::perlbrew->resolve_installation_name requires one argument." unless $name;
13851482
1386-
if ( $self->is_installed($name) ) {
1483+
my ($perl_name, $lib_name) = split('@', $name);
1484+
$perl_name = $name unless $lib_name;
1485+
1486+
if ( $self->is_installed($perl_name) ) {
13871487
return $name;
13881488
}
1389-
elsif ($self->is_installed("perl-$name")) {
1390-
return "perl-$name";
1489+
elsif ($self->is_installed("perl-${perl_name}")) {
1490+
return "perl-${name}";
13911491
}
13921492
13931493
return undef;

‎t/command-env.t

+16-13
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ use Config;
1919
mock_perlbrew_install("perl-5.14.1");
2020

2121
describe "env command," => sub {
22-
describe "when invoked with a perl installation name", sub {
22+
describe "when invoked with a perl installation name,", sub {
2323
it "displays environment variables that should be set to use the given perl." => sub {
2424
my $app = App::perlbrew->new("env", "perl-5.14.1");
2525

2626
stdout_is {
2727
$app->run;
2828
} <<"OUT";
29-
export PERLBREW_PERL=perl-5.14.1
30-
export PERLBREW_VERSION=$App::perlbrew::VERSION
31-
export PERLBREW_PATH=$App::perlbrew::PERLBREW_ROOT/bin:$App::perlbrew::PERLBREW_ROOT/perls/perl-5.14.1/bin
32-
export PERLBREW_ROOT=$App::perlbrew::PERLBREW_ROOT
29+
export PERLBREW_PERL="perl-5.14.1"
30+
export PERLBREW_VERSION="$App::perlbrew::VERSION"
31+
export PERLBREW_PATH="$App::perlbrew::PERLBREW_ROOT/bin:$App::perlbrew::PERLBREW_ROOT/perls/perl-5.14.1/bin"
32+
export PERLBREW_ROOT="$App::perlbrew::PERLBREW_ROOT"
3333
OUT
3434
};
3535
};
3636

37-
describe "when invoked with a perl installation name with lib name", sub {
38-
it "displays environment variables that should be set to use the given perl." => sub {
37+
describe "when invoked with a perl installation name with lib name,", sub {
38+
it "displays local::lib-related environment variables that should be set to use the given perl." => sub {
3939
note 'perlbrew env perl-5.14.1@nobita';
4040

4141
my $PERL5LIB_maybe = $ENV{PERL5LIB} ? ":\$PERL5LIB" : "";
@@ -45,12 +45,15 @@ OUT
4545
stdout_is {
4646
$app->run;
4747
} <<"OUT";
48-
export PERLBREW_PERL=perl-5.14.1
49-
export PERLBREW_LIB=nobita
50-
export PERLBREW_VERSION=$App::perlbrew::VERSION
51-
export PERLBREW_PATH=$lib_dir/bin:$App::perlbrew::PERLBREW_ROOT/bin:$App::perlbrew::PERLBREW_ROOT/perls/perl-5.14.1/bin
52-
export PERLBREW_ROOT=$App::perlbrew::PERLBREW_ROOT
53-
export PERL5LIB=$lib_dir/lib/perl5/$Config{archname}:$lib_dir/lib/perl5${PERL5LIB_maybe}
48+
export PERLBREW_PERL="perl-5.14.1"
49+
export PERLBREW_VERSION="$App::perlbrew::VERSION"
50+
export PERL_MB_OPT="--install_base $lib_dir"
51+
export PERL_MM_OPT="INSTALL_BASE=$lib_dir"
52+
export PERL_LOCAL_LIB_ROOT="$lib_dir"
53+
export PERL5LIB="$lib_dir/lib/perl5/$Config{archname}:$lib_dir/lib/perl5${PERL5LIB_maybe}"
54+
export PERLBREW_LIB="nobita"
55+
export PERLBREW_PATH="$lib_dir/bin:$App::perlbrew::PERLBREW_ROOT/bin:$App::perlbrew::PERLBREW_ROOT/perls/perl-5.14.1/bin"
56+
export PERLBREW_ROOT="$App::perlbrew::PERLBREW_ROOT"
5457
OUT
5558
}
5659
}

0 commit comments

Comments
 (0)