[Catalyst-commits] r9595 - in Catalyst-Devel/1.00/trunk: . lib/Catalyst

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-03-28 16:51:59 +0000 (Sat, 28 Mar 2009)
New Revision: 9595

Modified:
   Catalyst-Devel/1.00/trunk/Changes
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
Log:
On the suggestion of mst, which I totally agree with.

Modified: Catalyst-Devel/1.00/trunk/Changes
===================================================================
--- Catalyst-Devel/1.00/trunk/Changes	2009-03-28 05:01:57 UTC (rev 9594)
+++ Catalyst-Devel/1.00/trunk/Changes	2009-03-28 16:51:59 UTC (rev 9595)
@@ -1,5 +1,8 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+        - Change generated scripts to use /usr/bin/env perl if /usr/bin/env
+          exists, otherwise fall back to the current perl binary. (t0m)
+
 1.10    2009-02-05 15:04
         - fix a bug in created helper scripts that prevened them working (rjbs)
 

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-03-28 05:01:57 UTC (rev 9594)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-03-28 16:51:59 UTC (rev 9595)
@@ -58,7 +58,9 @@
     $self->{script          } = File::Spec->catdir( $self->{dir}, 'script' );
     $self->{appprefix       } = Catalyst::Utils::appprefix($name);
     $self->{appenv          } = Catalyst::Utils::class2env($name);
-    $self->{startperl       } = "#!$Config{perlpath} -w";
+    $self->{startperl       } = -r '/usr/bin/env' 
+                                ? '#!/usr/bin/env perl' 
+                                : "#!$Config{perlpath} -w";
     $self->{scriptgen       } = $Catalyst::Devel::CATALYST_SCRIPT_GEN || 4;
     $self->{catalyst_version} = $Catalyst::VERSION;
     $self->{author          } = $self->{author} = $ENV{'AUTHOR'}