X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=2aa4003fe8f2d6656fdfbb25fc054f17dde61471;hb=c571e72ba408ecf1af0010563f19b460b2a2a8f9;hp=44726fc1e1565e5a845c005d539670f82bfe33d3;hpb=566ee5d777a655fce380b8fe864a99809f7c8e04;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 44726fc..2aa4003 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -11,7 +11,7 @@ our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
-our $VERSION = '5.20';
+our $VERSION = '5.23';
 our @ISA;
 
 =head1 NAME
@@ -284,6 +284,39 @@ sub import {
 
     # Find home
     my $home = Catalyst::Utils::home($caller);
+
+    if ( my $h = $ENV{CATALYST_HOME} ) {
+
+        $home = $h if -d $h;
+
+        unless ( -e _ ) {
+            $caller->log->warn(qq/CATALYST_HOME does not exist "$h"/);
+        }
+
+        unless ( -e _ && -d _ ) {
+            $caller->log->warn(qq/CATALYST_HOME is not a directory "$h"/);
+        }
+    }
+
+    if ( my $h = $ENV{ uc($caller) . '_HOME' } ) {
+
+        $home = $h if -d $h;
+
+        unless ( -e _ ) {
+            my $e = uc($caller) . '_HOME';
+            $caller->log->warn(qq/$e does not exist "$h"/)
+        }
+
+        unless ( -e _ && -d _ ) {
+            my $e = uc($caller) . '_HOME';
+            $caller->log->warn(qq/$e is not a directory "$h"/);
+        }
+    }
+    
+    if ( -d $home ) {
+        $home = dir($home)->absolute;
+    }
+
     if ( $caller->debug ) {
         $home
           ? ( -d $home )