use #!perl for installation and recommend it for installable scripts

mojolicious · Nov 24, 2014 · 2ccaefe · 2ccaefe
1 parent 058c294
commit 2ccaefe
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -114,8 +114,7 @@ __DATA__
 use strict;
 use warnings;
 
-use FindBin;
-BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
+use lib 'lib';
 
 # Start command line interface for application
 require Mojolicious::Commands;

diff --git a/lib/Mojolicious/Guides/Cookbook.pod b/lib/Mojolicious/Guides/Cookbook.pod
@@ -1430,6 +1430,30 @@ get automatically installed with the modules.
 
   1;
 
+Finally C<myapp.pl> can be replaced with an installable L<Mojolicious> script.
+
+  $ rm myapp.pl
+  $ mkdir script
+  $ touch script/myapp
+  $ chmod 744 script/myapp
+
+Only a few small details change. We change the shebang to the recommended
+C<#!perl>, which the toolchain rewrites to the proper shebang during
+installation. We also use C<FindBin> rather than L<lib> since installable
+scripts can't use L<lib> without breaking updated dual-life modules.
+
+  #!perl
+
+  use strict;
+  use warnings;
+
+  use FindBin;
+  BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
+
+  # Start command line interface for application
+  require Mojolicious::Commands;
+  Mojolicious::Commands->start_app('MyApp');
+
 That's really everything, now you can package your application like any other
 CPAN module.
 

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -612,9 +612,9 @@ allow running tests again.
   use warnings;
 
   use lib 'lib';
-  use Mojolicious::Commands;
 
   # Start command line interface for application
+  require Mojolicious::Commands;
   Mojolicious::Commands->start_app('MyApp');
 
 And the directory structure of our hybrid application should be looking like
@@ -719,30 +719,6 @@ moved into the appropriate directories.
   $ mv templates/index.html.ep templates/login/index.html.ep
   $ mv templates/protected.html.ep templates/login/protected.html.ep
 
-=head2 Script
-
-Finally C<myapp.pl> can be replaced with a proper L<Mojolicious> script.
-
-  $ rm myapp.pl
-  $ mkdir script
-  $ touch script/myapp
-  $ chmod 744 script/myapp
-
-Only a few small details change, since installable scripts can't use L<lib>
-without breaking updated dual-life modules.
-
-  #!/usr/bin/env perl
-
-  use strict;
-  use warnings;
-
-  use FindBin;
-  BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
-
-  # Start command line interface for application
-  require Mojolicious::Commands;
-  Mojolicious::Commands->start_app('MyApp');
-
 =head2 Simplified tests
 
 Full L<Mojolicious> applications are a little easier to test, so C<t/login.t>

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!perl
 
 use strict;
 use warnings;

diff --git a/script/mojo b/script/mojo
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!perl
 
 use strict;
 use warnings;

diff --git a/script/morbo b/script/morbo
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!perl
 
 use strict;
 use warnings;