reverted latest path from Andy Grundman

diff --git a/Changes b/Changes
index c433613..6cc886a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,8 +1,6 @@
 This file documents the revision history for Perl extension Catalyst.
 
 5.24  2005-06-03 02:30:00
-        - win32 compatibility for scripts (Andy Grundman)
-        IMPORTANT: You have to regenerate the script directory!
 
 5.23  2005-06-03 02:30:00
         - added support for non Catalyst::Base components to live in namespace

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 3d72db5..e8ad1d5 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -528,16 +528,11 @@ plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
 all_pod_coverage_ok();
 __cgi__
 [% startperl %] -w
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 
 use strict;
 use FindBin;
-use Path::Class;
-
-BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'CGI';
-    use lib dir($FindBin::Bin)->parent->subdir('lib')->stringify;
-}
-
+use lib "$FindBin::Bin/../lib";
 use [% name %];
 
 [% name %]->run;
@@ -571,15 +566,11 @@ it under the same terms as perl itself.
 __fastcgi__
 [% startperl %] -w
 
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
+
 use strict;
 use FindBin;
-use Path::Class;
-
-BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'FastCGI';
-    use lib dir($FindBin::Bin)->parent->subdir('lib')->stringify;
-}
-
+use lib "$FindBin::Bin/../lib";
 use [% name %];
 
 [% name %]->run;
@@ -613,18 +604,16 @@ it under the same terms as perl itself.
 __server__
 [% startperl %] -w
 
+BEGIN { 
+    $ENV{CATALYST_ENGINE} ||= 'HTTP';
+    $ENV{CATALYST_SCRIPT_GEN} = [% scriptgen %];
+}  
+
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use Path::Class;
-
-BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = [% scriptgen %];
-    use lib dir($FindBin::Bin)->parent->subdir('lib')->stringify;
-}
-
+use lib "$FindBin::Bin/../lib";
 use [% name %];
 
 my $help = 0;
@@ -673,17 +662,13 @@ it under the same terms as perl itself.
 __test__
 [% startperl %] -w
 
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'Test' }
+
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use Path::Class;
-
-BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'Test';
-    use lib dir($FindBin::Bin)->parent->subdir('lib')->stringify;
-}
-
+use lib "$FindBin::Bin/../lib";
 use [% name %];
 
 my $help = 0;