fixed scripts to allow dual-life modules to be updated

mojolicious · Mar 4, 2013 · 94deb00 · 94deb00
1 parent a8bec13
commit 94deb00
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 3.89  2013-03-04
   - Improved documentation.
   - Improved tests.
+  - Fixed scripts to allow dual-life modules to be updated. (jberger, sri)
   - Fixed bug preventing delayed normalization for reused Mojo::Path objects.
   - Fixed path matching bug in Mojo::Path.
 

diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -56,8 +56,9 @@ __DATA__
 use strict;
 use warnings;
 
+# Make sure dual-life modules can be updated
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 # Start command line interface for application
 require Mojolicious::Commands;

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -648,8 +648,9 @@ Only a few small details change.
   use strict;
   use warnings;
 
+  # Make sure dual-life modules can be updated
   use FindBin;
-  use lib "$FindBin::Bin/../lib";
+  BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
   # Start command line interface for application
   require Mojolicious::Commands;

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -3,8 +3,9 @@
 use strict;
 use warnings;
 
+# Make sure dual-life modules can be updated
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 

diff --git a/script/mojo b/script/mojo
@@ -3,8 +3,9 @@
 use strict;
 use warnings;
 
+# Make sure dual-life modules can be updated
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 require Mojolicious::Commands;
 Mojolicious::Commands->start_app('Mojo::HelloWorld');

diff --git a/script/morbo b/script/morbo
@@ -3,8 +3,9 @@
 use strict;
 use warnings;
 
+# Make sure dual-life modules can be updated
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 

diff --git a/t/mojolicious/external/script/my_app b/t/mojolicious/external/script/my_app
@@ -3,8 +3,9 @@
 use strict;
 use warnings;
 
+# Make sure dual-life modules can be updated
 use FindBin;
-use lib "$FindBin::Bin/../lib";
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 # Start command line interface for application
 require Mojolicious::Commands;