Merge branch 'bugs/rt-75731'

[catagits/Catalyst-Runtime.git] / lib / Catalyst / ScriptRunner.pm

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index 7619e61..b9a60f8 100644 (file)
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -4,8 +4,9 @@ use FindBin;
 use lib;
 use File::Spec;
 use Class::Load qw/ load_first_existing_class load_optional_class /;
-use namespace::autoclean -also => 'subclass_with_traits';
+use Catalyst::Utils;
 use Try::Tiny;
+use namespace::clean -except => [ 'meta' ];
 
 sub find_script_class {
     my ($self, $app, $script) = @_;
@@ -18,6 +19,7 @@ sub find_script_traits {
     return grep { load_optional_class($_) } @try;
 }
 
+no namespace::clean;
 sub subclass_with_traits {
     my ($base, @traits) = @_;
 
@@ -30,11 +32,14 @@ sub subclass_with_traits {
 
     return $meta->name;
 }
+use namespace::clean;
 
 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);