fixed bug that prevented newer dual-life modules to be loaded

mojolicious · Feb 5, 2012 · 8ec2b92 · 8ec2b92
1 parent be2ffee
commit 8ec2b92
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -23,6 +23,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved documentation.
         - Improved tests.
         - Improved CSS of some built-in templates.
+        - Fixed bug that prevented newer dual-life modules to be loaded.
         - Fixed small bug in Mojo::IOLoop::Stream that caused close events to
           fail sometimes.
         - Fixed small relative URL detection bug in get command.

diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -56,8 +56,7 @@ use Mojo::Base -strict;
 use File::Basename 'dirname';
 use File::Spec;
 
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
 # Check if Mojolicious is installed;
 die <<EOF unless eval 'use Mojolicious::Commands; 1';

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -656,8 +656,7 @@ environments.
   use File::Basename 'dirname';
   use File::Spec;
 
-  use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-  use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+  push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
   # Check if Mojolicious is installed
   die <<EOF unless eval 'use Mojolicious::Commands; 1';

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -6,8 +6,7 @@ use warnings;
 use File::Basename 'dirname';
 use File::Spec;
 
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
 # Check if Mojolicious is installed
 die <<EOF unless eval 'use Mojo::Server::Hypnotoad; 1';

diff --git a/script/mojo b/script/mojo
@@ -6,8 +6,7 @@ use warnings;
 use File::Basename 'dirname';
 use File::Spec;
 
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
 # Check if Mojolicious is installed
 die <<EOF unless eval 'use Mojolicious::Commands; 1';

diff --git a/script/morbo b/script/morbo
@@ -6,8 +6,7 @@ use warnings;
 use File::Basename 'dirname';
 use File::Spec;
 
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
 # Check if Mojolicious is installed
 die <<EOF unless eval 'use Mojo::Server::Morbo; 1';

diff --git a/t/mojolicious/external/script/my_app b/t/mojolicious/external/script/my_app
@@ -12,8 +12,7 @@ use File::Spec;
 #  That way you can't accidentally change history or do something disgusting
 #  like sleep with your own grandmother.
 #  I wouldn't want to do that again."
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
-use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
+push @INC, join('/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib');
 
 # Check if Mojolicious is installed
 die <<EOF unless eval 'use Mojolicious::Commands; 1';