X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRunner.pm;h=1b52e1337b0f47d2b181bf148c1160d67d247859;hb=7e9340de3b12a6c9da620a34d2f1f1f2ec6f6c60;hp=f652e785bcafad718a0349e074843ec793262ea3;hpb=859ab869f91223b635a515ede9b083df2b964961;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm index f652e78..1b52e13 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 (my $home = Catalyst::Utils::home($appclass)) { + lib->import(File::Spec->catdir($home, 'lib')); + } my $class = $self->find_script_class($appclass, $scriptclass); @@ -48,6 +51,7 @@ sub run { } __PACKAGE__->meta->make_immutable; +1; =head1 NAME