X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRunner.pm;h=caf16dc37e366f76cbf88e603c8a78136fb05ed7;hp=f652e785bcafad718a0349e074843ec793262ea3;hb=d0cacee71a316290bc01f0e12681c16bdc1e84e2;hpb=859ab869f91223b635a515ede9b083df2b964961

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index f652e78..caf16dc 100644
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -4,6 +4,7 @@ use FindBin;
 use lib;
 use File::Spec;
 use Class::Load qw/ load_first_existing_class load_optional_class /;
+use Catalyst::Utils;
 use namespace::autoclean -also => 'subclass_with_traits';
 use Try::Tiny;
 
@@ -34,7 +35,9 @@ sub subclass_with_traits {
 sub run {
     my ($self, $appclass, $scriptclass) = @_;
 
-    lib->import(File::Spec->catdir($FindBin::Bin, '..', 'lib'));
+    if (grep { -f File::Spec->catfile($FindBin::Bin, '..', $_) } Catalyst::Utils::dist_indicator_file_list()) {
+        lib->import(File::Spec->catdir($FindBin::Bin, '..', 'lib'));
+    }
 
     my $class = $self->find_script_class($appclass, $scriptclass);
 
@@ -48,6 +51,7 @@ sub run {
 }
 
 __PACKAGE__->meta->make_immutable;
+1;
 
 =head1 NAME