X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=3dea5bf288828cb6f5328d5c3a063bff226f336d;hb=b143d045389639ccd7aa236efb67b5cbfe65773e;hp=e8e44be0f41f4dc31b7d4467a674d6542f21592b;hpb=4662123fd45a165ecf9ae4226c83215ba8d04913;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index e8e44be..3dea5bf 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,15 +1,35 @@
 use strict;
 use warnings;
-use vars qw($bootstrapping);
+use File::Spec;
+use Cwd;
+use vars qw($bootstrapping $bootstrapping_args);
+use Config;
 
+my $cwd;
 BEGIN {
+  $cwd = Cwd::cwd();
+  # watch out for fancy dashes. these can wind up in our @ARGV if the user is
+  # copypasting the bootstrap command from the POD displayed e.g. by perldoc
+  # on a Mac OS X terminal. since no software recognizes and handles these
+  # dashes, it's better to die loudly telling the user exactly what happened
+  # so they don't make the same mistake again rather than being the only
+  # program in the universe that works with them.
+  if(grep { /−/ } @ARGV) {
+      die <<'DEATH';
+WHOA THERE! It looks like you've got some fancy dashes in your commandline!
+These are *not* the traditional -- dashes that software recognizes. You
+probably got these by copy-pasting from the perldoc for this module as
+rendered by a UTF8-capable formatter. This most typically happens on an OS X
+terminal, but can happen elsewhere too. Please try again after replacing the
+dashes with normal minus signs.
+DEATH
+  }
   if (my ($x) = grep { /^--bootstrap(?:=.*)?$/ } @ARGV) {
     @ARGV = grep { !/^--bootstrap(?:=.*)?$/ } @ARGV;
     $bootstrapping = 1;
-    $x =~ /^--bootstrap(?:=(.*))?$/;
-    my @args = (defined $1 ? ($1) : ());
+    my ($path) = $x =~ /^--bootstrap(?:=(.*))?$/;
+    my @args = $path ? $path : ();
 
-    $ENV{PERL_MM_USE_DEFAULT} = 1;
     {
       local @INC = @INC;
       unshift(@INC, 'lib');
@@ -18,8 +38,10 @@ BEGIN {
 
     local::lib->import(@args);
 
+    my @libs = map { "-I$_" } split $Config{path_sep}, $ENV{PERL5LIB};
+    $bootstrapping_args = "@libs";
     push(@ARGV,$ENV{PERL_MM_OPT});
-    push(@ARGV, map { "-I$_" } split(':',$ENV{PERL5LIB}));
+    push(@ARGV, @libs);
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
@@ -29,24 +51,26 @@ BEGIN {
     my $cpan_command = '';
 
     system($^X, '-MCPAN', '-e',
-      'CPAN::Config->load;
-       unless (-w $CPAN::Config->{keep_source_where}) {
+      'my $done; require ExtUtils::MakeMaker;
+       my $orig = ExtUtils::MakeMaker->can("prompt");
+       *ExtUtils::MakeMaker::prompt = sub ($;$) {
+         if (!$done && $_[0] =~ /manual configuration/) {
+           $done++;
+           return "no";
+         }
+         return $orig->(@_);
+       };
+       CPAN::Config->load;
+       unless ($done || -w $CPAN::Config->{keep_source_where}) {
          my $save = $CPAN::Config->{urllist};
          delete @{$CPAN::Config}{keys %$CPAN::Config};
          $CPAN::Config->{urllist} = $save;
-         my $orig = ExtUtils::MakeMaker->can("prompt");
-         my $done;
-         *ExtUtils::MakeMaker::prompt = sub {
-           if (!$done && $_[0] =~ /manual configuration/) {
-             $done++;
-             return "no";
-           }
-           return $orig->(@_);
-         };
          CPAN::Config->init;
        }'
     );
 
+    $ENV{PERL_MM_USE_DEFAULT} = 1;
+
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
     if ($eumm) { # non-zero exit
@@ -61,6 +85,8 @@ BEGIN {
     if ($cpan) {
       system($^X, '-MCPAN', '-e', 'CPAN::Config->load; CPAN::Config->commit;');
     }
+
+    chdir($cwd);
   }
 }
 
@@ -82,13 +108,35 @@ requires 'CPAN' => '1.80'; # sudo support
 # without this beautiful hack
 
 my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
 require CPAN;
 delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+
+# and make sure that the user doesn't have any existing CPAN config that'll
+# cause us problems for the next few steps.
+require CPAN::HandleConfig;
+CPAN::HandleConfig->load;
+for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+    if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+        die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
+    }
+}
+
+for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+    if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+        die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+    }
+}
 
 if ($bootstrapping) {
   auto_install_now;
+  postamble <<"END";
+PERL     += $bootstrapping_args
+FULLPERL += $bootstrapping_args
+END
 } else {
   auto_install;
 }
-
+chdir($cwd);
 WriteAll;