Merge branch 'master' into psgi

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Script / CGI.pm

diff --git a/lib/Catalyst/Script/CGI.pm b/lib/Catalyst/Script/CGI.pm
index ede29b5..dc7f20f 100644 (file)
--- a/lib/Catalyst/Script/CGI.pm
+++ b/lib/Catalyst/Script/CGI.pm
@@ -1,14 +1,10 @@
 package Catalyst::Script::CGI;
 use Moose;
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 use namespace::autoclean;
 
-with 'Catalyst::ScriptRole';
+sub _plack_engine_name { 'CGI' }
 
-sub run {
-    my ($self) = @_;
-    $self->_run_application;
-}
+with 'Catalyst::ScriptRole';
 
 __PACKAGE__->meta->make_immutable;
 
@@ -18,11 +14,14 @@ Catalyst::Script::CGI - The CGI Catalyst Script
 
 =head1 SYNOPSIS
 
-See L<Catalyst>.
+  myapp_cgi.pl [options]
+
+  Options:
+  -?     --help           display this help and exits
 
 =head1 DESCRIPTION
 
-FIXME
+This is a script to run the Catalyst engine specialized for the CGI environment.
 
 =head1 AUTHORS