modernized some eval statements

mojolicious · Oct 14, 2011 · 849003d · 849003d
1 parent 7920d3f
commit 849003d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -63,9 +63,8 @@ use File::Spec;
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
-# Check if Mojolicious is installed
-eval 'use Mojolicious::Commands';
-die <<EOF if $@;
+# Check if Mojolicious is installed;
+die <<EOF unless eval 'use Mojolicious::Commands; 1';
 It looks like you don't have the Mojolicious framework installed.
 Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -661,8 +661,7 @@ environments.
   use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
   # Check if Mojolicious is installed
-  eval 'use Mojolicious::Commands';
-  die <<EOF if $@;
+  die <<EOF unless eval 'use Mojolicious::Commands; 1';
   It looks like you don't have the Mojolicious framework installed.
   Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -10,8 +10,7 @@ use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
 # Check if Mojolicious is installed
-eval 'use Mojo::Server::Hypnotoad';
-die <<EOF if $@;
+die <<EOF unless eval 'use Mojo::Server::Hypnotoad; 1';
 It looks like you don't have the Mojolicious framework installed.
 Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/script/mojo b/script/mojo
@@ -10,8 +10,7 @@ use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
 # Check if Mojolicious is installed
-eval 'use Mojolicious::Commands';
-die <<EOF if $@;
+die <<EOF unless eval 'use Mojolicious::Commands; 1';
 It looks like you don't have the Mojolicious framework installed.
 Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/script/morbo b/script/morbo
@@ -10,8 +10,7 @@ use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
 # Check if Mojolicious is installed
-eval 'use Mojo::Server::Morbo';
-die <<EOF if $@;
+die <<EOF unless eval 'use Mojo::Server::Morbo; 1';
 It looks like you don't have the Mojolicious framework installed.
 Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/t/mojolicious/external/script/my_app b/t/mojolicious/external/script/my_app
@@ -16,8 +16,7 @@ use lib join '/', File::Spec->splitdir(dirname(__FILE__)), 'lib';
 use lib join '/', File::Spec->splitdir(dirname(__FILE__)), '..', 'lib';
 
 # Check if Mojolicious is installed
-eval 'use Mojolicious::Commands';
-die <<EOF if $@;
+die <<EOF unless eval 'use Mojolicious::Commands; 1';
 It looks like you don't have the Mojolicious framework installed.
 Please visit http://mojolicio.us for detailed installation instructions.
 

diff --git a/t/pod.t b/t/pod.t
@@ -3,8 +3,8 @@ use Mojo::Base -strict;
 
 use Test::More;
 
-eval "use Test::Pod 1.14";
-plan skip_all => 'Test::Pod 1.14 required for this test!' if $@;
+plan skip_all => 'Test::Pod 1.14 required for this test!'
+  unless eval 'use Test::Pod 1.14; 1';
 plan skip_all => 'set TEST_POD to enable this test (developer only!)'
   unless $ENV{TEST_POD};
 

diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -3,8 +3,8 @@ use Mojo::Base -strict;
 
 use Test::More;
 
-eval "use Test::Pod::Coverage 1.04";
-plan skip_all => 'Test::Pod::Coverage 1.04 required for this test!' if $@;
+plan skip_all => 'Test::Pod::Coverage 1.04 required for this test!'
+  unless eval 'use Test::Pod::Coverage 1.04; 1';
 plan skip_all => 'set TEST_POD to enable this test (developer only!)'
   unless $ENV{TEST_POD};