X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=3d9252cda78b959c2db0c0fec36b2097960d0701;hb=5eff9c2438093d9f72e3359178acc747882d890a;hp=6939e2ada1f06fc91f73f713f5cb36c17fe13d87;hpb=d430f53809a564fc3d27394697461527d9c50db6;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 6939e2a..3d9252c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -45,7 +45,8 @@ BEGIN {
   # 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) {
+  # the fancy dash is U+2212 or \xE2\x88\x92
+  if(grep { /\xE2\x88\x92/ } @ARGV or 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
@@ -183,24 +184,26 @@ all_from 'lib/local/lib.pm';
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::Install' => '1.43'; # ditto
 requires 'Module::Build' => '0.36'; # PERL_MB_OPT
-my $required_CPAN = '1.82';
-requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
-# No, really. See
-# https://rt.cpan.org/Public/Bug/Display.html?id=23735
-# for why CPAN now sets the CPANPLUS env var.
-# trouble is this means we can't auto_install(_now) CPAN itself
-# without this beautiful hack
+# don't bother fixing CPAN.pm if bootstrapped from cpanminus
+unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
+    my $required_CPAN = '1.82';
+    requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
-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;
+    # No, really. See
+    # https://rt.cpan.org/Public/Bug/Display.html?id=23735
+    # for why CPAN now sets the CPANPLUS env var.
+    # trouble is this means we can't auto_install(_now) CPAN itself
+    # without this beautiful hack
 
-# and make sure that the user doesn't have any existing CPAN config that'll
-# cause us problems for the next few steps.
-{
+    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.
     local $@;
     eval { require CPAN::HandleConfig; };
     # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
@@ -252,6 +255,7 @@ END
 }
 chdir($cwd);
 resources(
+  # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git
   repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
   homepage => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git',
   bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=local-lib',