X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=script%2Fcatalyst.pl;h=a0c232472767a7e853dcc2d11e7c75ccd207aaa0;hp=34a6f94f022d090be1e22590238822e35db8162d;hb=c463b49c849c28a6fa46e9eb1c07a31b51696f1d;hpb=34d28dfd33574ce30aca69fb8700b61111d97b92

diff --git a/script/catalyst.pl b/script/catalyst.pl
index 34a6f94..a0c2324 100755
--- a/script/catalyst.pl
+++ b/script/catalyst.pl
@@ -3,21 +3,35 @@
 use strict;
 use Getopt::Long;
 use Pod::Usage;
-eval 'use Catalyst::Helper "1.0";';
-die "Please install Catalyst::Helper!\n" if $@;
+BEGIN {
+eval " use Catalyst::Devel 1.0; ";
+
+if ($@) {
+  die <<END;
+To use the Catalyst development tools including catalyst.pl and the
+generated script/myapp_create.pl you need Catalyst::Helper, which is
+part of the Catalyst-Devel distribution. Please install this via a
+vendor package or by running one of -
+
+  perl -MCPAN -e 'install Catalyst::Devel'
+  perl -MCPANPLUS -e 'install Catalyst::Devel'
+END
+
+}
+};
+
+use Catalyst::Helper;
 
 my $force    = 0;
 my $help     = 0;
 my $makefile = 0;
 my $scripts  = 0;
-my $short    = 0;
 
 GetOptions(
     'help|?'      => \$help,
     'force|nonew' => \$force,
     'makefile'    => \$makefile,
     'scripts'     => \$scripts,
-    'short'       => \$short
 );
 
 pod2usage(1) if ( $help || !$ARGV[0] );
@@ -27,9 +41,10 @@ my $helper = Catalyst::Helper->new(
         '.newfiles' => !$force,
         'makefile'  => $makefile,
         'scripts'   => $scripts,
-        'short'     => $short,
+        name => $ARGV[0],
     }
 );
+# Pass $ARGV[0] for compatibility with old ::Devel
 pod2usage(1) unless $helper->mk_app( $ARGV[0] );
 
 1;
@@ -51,7 +66,6 @@ upgrade the skeleton of your old application.
    -help       display this help and exit
    -makefile   only update Makefile.PL
    -scripts    only update helper scripts
-   -short      use short names, M/V/C instead of Model/View/Controller.
 
  application-name must be a valid Perl module name and can include "::", 
  which will be converted to '-' in the project name.
@@ -128,7 +142,7 @@ runs the generated application as a FastCGI script
 
 =item C<myapp_test.pl>
 
-runs an action of the generated application from the comand line.
+runs an action of the generated application from the command line.
 
 =back
 
@@ -138,11 +152,9 @@ test directory
 
 =back
 
-
 The application module generated by the C<catalyst.pl> script is functional,
 although it reacts to all requests by outputting a friendly welcome screen.
 
-
 =head1 NOTE
 
 Neither C<catalyst.pl> nor the generated helper script will overwrite existing
@@ -155,22 +167,16 @@ Catalyst or its plugins generate different code, or to see how you may have
 changed the generated code (although you do of course have all your code in a
 version control system anyway, don't you ...).
 
-
-
 =head1 SEE ALSO
 
 L<Catalyst::Manual>, L<Catalyst::Manual::Intro>
 
-=head1 AUTHOR
-
-Sebastian Riedel, C<sri@oook.de>,
-Andrew Ford, C<A.Ford@ford-mason.co.uk>
+=head1 AUTHORS
 
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-Copyright 2004-2005 Sebastian Riedel. All rights reserved.
-
 This library is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.