Updated for 5.60

diff --git a/Makefile.PL b/Makefile.PL
index 35cd9df..f063c77 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,18 +1,42 @@
 use inc::Module::Install;
 
 # ExtUtils::AutoInstall Bootstrap Code, version 7.
-BEGIN{my$p='ExtUtils::AutoInstall';my$v=0.45;$p->VERSION||0>=$v
-or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL};
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or
-eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
-);1"and exit)and print"==> $p $v required. Install it from CP".
-"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and
-do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo',
-$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1"
-||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{
-require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{
-require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please
-manually install $p $v from cpan.org first...\n"}}}
+BEGIN {
+    my $p = 'ExtUtils::AutoInstall';
+    my $v = 0.45;
+    $p->VERSION || 0 >= $v
+      or +eval "use $p $v;1"
+      or +do {
+        my $e = $ENV{PERL_EXTUTILS_AUTOINSTALL};
+        (
+            !defined($e) || $e !~ m/--(?:default|skip|testonly)/ and -t STDIN
+              or eval
+              "use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
+);1" and exit
+          )
+          and print "==> $p $v required. Install it from CP" . "AN? [Y/n] "
+          and <STDIN> !~ /^n/i
+          and print "*** Installing $p\n"
+          and do {
+            if ( eval '$>' and lc(`sudo -V`) =~ /version/ ) {
+                system( 'sudo', $^X, "-MCPANPLUS", "-e",
+                    "CPANPLUS::install $p" );
+                eval "use $p $v;1"
+                  || system( 'sudo', $^X, "-MCPAN", "-e", "CPAN::install $p" );
+            }
+            eval {
+                require CPANPLUS;
+                CPANPLUS::install $p;
+            };
+            eval "use $p $v;1" or eval {
+                require CPAN;
+                CPAN::install $p;
+            };
+            eval "use $p $v;1" || die "*** Please
+manually install $p $v from cpan.org first...\n";
+          }
+      }
+}
 
 name('Catalyst');
 abstract('Catalyst Web Framework');

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 99aec69..55f4938 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -43,7 +43,7 @@ our $DETACH    = "catalyst_detach\n";
 require Module::Pluggable::Fast;
 
 # Helper script generation
-our $CATALYST_SCRIPT_GEN = 21;
+our $CATALYST_SCRIPT_GEN = 22;
 
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class
@@ -54,7 +54,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI');
 __PACKAGE__->request_class('Catalyst::Request');
 __PACKAGE__->response_class('Catalyst::Response');
 
-our $VERSION = '5.59';
+our $VERSION = '5.60';
 
 sub import {
     my ( $class, @arguments ) = @_;