Resolving paths properly when akelos is installed globally.

akelos · Jun 19, 2011 · 9594972 · 9594972
1 parent fa34833
commit 9594972
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/makelos b/makelos
@@ -7,12 +7,16 @@ if (isset($argv[1]) && strstr($argv[1], 'test:')){
     define('AK_ENVIRONMENT', 'testing');
 }
 
-if(is_file(dirname(__FILE__).DS.'config'.DS.'config.php')){
-    include(dirname(__FILE__).DS.'config'.DS.'config.php');
+if(is_file(dirname(realpath(__FILE__)).DS.'config'.DS.'config.php')){
+    include(dirname(realpath(__FILE__)).DS.'config'.DS.'config.php');
 }
 
 if(defined('AK_FRAMEWORK_DIR')){
     include AK_FRAMEWORK_DIR.DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php';
-}elseif(!is_file('akelos_utils'.DS.'makelos'.DS.'makelos.php') || !include('akelos_utils'.DS.'makelos'.DS.'makelos.php')){
-    include 'vendor'.DS.'akelos'.DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php';
-}
+}elseif(!is_file(dirname(realpath(__FILE__)).DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php') ||
+        !include(dirname(realpath(__FILE__)).DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php')) {
+
+    if(is_file('vendor'.DS.'akelos'.DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php')){
+        include 'vendor'.DS.'akelos'.DS.'akelos_utils'.DS.'makelos'.DS.'makelos.php';
+    }
+}