Fix scripts. I also appear to have fucked things so we're getting actions we shouldn...

diff --git a/script/dynamicappdemo_cgi.pl b/script/dynamicappdemo_cgi.pl
index 2a20c9d..439362a 100755 (executable)
--- a/script/dynamicappdemo_cgi.pl
+++ b/script/dynamicappdemo_cgi.pl
@@ -5,7 +5,7 @@ BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 use strict;
 use warnings;
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../lib", "$FindBin/../t/lib";
 use DynamicAppDemo;
 
 DynamicAppDemo->run;

diff --git a/script/dynamicappdemo_create.pl b/script/dynamicappdemo_create.pl
deleted file mode 100755 (executable)
index 0bbe8d0..0000000
--- a/script/dynamicappdemo_create.pl
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-eval "use Catalyst::Helper;";
-
-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
-}
-
-my $force = 0;
-my $mech  = 0;
-my $help  = 0;
-
-GetOptions(
-    'nonew|force'    => \$force,
-    'mech|mechanize' => \$mech,
-    'help|?'         => \$help
- );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } );
-
-pod2usage(1) unless $helper->mk_component( 'DynamicAppDemo', @ARGV );
-
-1;
-
-=head1 NAME
-
-dynamicappdemo_create.pl - Create a new Catalyst Component
-
-=head1 SYNOPSIS
-
-dynamicappdemo_create.pl [options] model|view|controller name [helper] [options]
-
- Options:
-   -force        don't create a .new file where a file to be created exists
-   -mechanize    use Test::WWW::Mechanize::Catalyst for tests if available
-   -help         display this help and exits
-
- Examples:
-   dynamicappdemo_create.pl controller My::Controller
-   dynamicappdemo_create.pl controller My::Controller BindLex
-   dynamicappdemo_create.pl -mechanize controller My::Controller
-   dynamicappdemo_create.pl view My::View
-   dynamicappdemo_create.pl view MyView TT
-   dynamicappdemo_create.pl view TT TT
-   dynamicappdemo_create.pl model My::Model
-   dynamicappdemo_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
-   dbi:SQLite:/tmp/my.db
-   dynamicappdemo_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\
-   dbi:Pg:dbname=foo root 4321
-
- See also:
-   perldoc Catalyst::Manual
-   perldoc Catalyst::Manual::Intro
-
-=head1 DESCRIPTION
-
-Create a new Catalyst Component.
-
-Existing component files are not overwritten.  If any of the component files
-to be created already exist the file will be written with a '.new' suffix.
-This behavior can be suppressed with the C<-force> option.
-
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut

diff --git a/script/dynamicappdemo_fastcgi.pl b/script/dynamicappdemo_fastcgi.pl
index b08465c..9dcab94 100755 (executable)
--- a/script/dynamicappdemo_fastcgi.pl
+++ b/script/dynamicappdemo_fastcgi.pl
@@ -7,7 +7,7 @@ use warnings;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../lib", "$FindBin/../t/lib";
 use DynamicAppDemo;
 
 my $help = 0;

diff --git a/script/dynamicappdemo_server.pl b/script/dynamicappdemo_server.pl
index 45413bd..5cfbb2e 100755 (executable)
--- a/script/dynamicappdemo_server.pl
+++ b/script/dynamicappdemo_server.pl
@@ -11,7 +11,7 @@ use warnings;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../lib", "$FindBin::Bin/../t/lib";
 
 my $debug             = 0;
 my $fork              = 0;

diff --git a/script/dynamicappdemo_test.pl b/script/dynamicappdemo_test.pl
index 98d2c94..1b7d640 100755 (executable)
--- a/script/dynamicappdemo_test.pl
+++ b/script/dynamicappdemo_test.pl
@@ -5,7 +5,7 @@ use warnings;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../lib", "$FindBin/../t/lib";
 use Catalyst::Test 'DynamicAppDemo';
 
 my $help = 0;