From 9594972af1e37253aff0b473470e92c030202941 Mon Sep 17 00:00:00 2001 From: Bermi Ferrer Date: Sun, 19 Jun 2011 21:25:14 +0200 Subject: [PATCH] Resolving paths properly when akelos is installed globally. --- makelos | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/makelos b/makelos index 9163e9ac..1c4281dd 100755 --- 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'; -} \ No newline at end of file +}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'; + } +}