Changeset 533 for trunk/bin/_config.inc.php

Timestamp:

Jul 13, 2015 8:48:29 PM (9 years ago)

Author:

anonymous

Message:

Adapted module maker scripts to use the new cli config file. Updated config to load codebase classes from its own codebase dir.

File:

• trunk/bin/_config.inc.php (modified) (4 diffs)

trunk/bin/_config.inc.php

@@ -27 +27 @@
 */
 
-$this_script = basename($_SERVER['argv'][0]);
+// The name of the CLI.
+$cli_executed = basename($_SERVER['argv'][0]);
 
-// Assume execution occurs while in the common app directory.
-define('COMMON_BASE', realpath('.'));
+// Enforce "relaxed" directory location, if set by the called script.
+// This script can be executed in any directory that is an ancestor 2 directories above the db_auth file.
+if (!defined('COMMON_BASE')) {
+    define('COMMON_BASE', realpath('.'));
+}
+
+// Use codebase files releative to this file.
+define('CODEBASE_PATH', realpath(dirname(__FILE__) . '/../'));
+
 $db_auth_file = false;
 $rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
@@ -41 +49 @@
 }
 if (!$db_auth_file) {
-    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND a db_auth file must exist within two directory levels.\n", $this_script));
+    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND a db_auth file must exist within two directory levels.\n", $cli_executed));
 }
 if (fileowner($db_auth_file) != getmyuid()) {
-    die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $this_script));
+    die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $cli_executed));
 }
 
@@ -55 +63 @@
 
 // Include core libraries.
-require_once 'codebase/lib/App.inc.php';
-require_once 'codebase/lib/Utilities.inc.php';
+require_once CODEBASE_PATH . '/lib/App.inc.php';
+require_once CODEBASE_PATH . '/lib/Utilities.inc.php';
 
 define('_CLI', true);
@@ -74 +82 @@
     'log_file_priority' => false,
     'log_screen_priority' => LOG_INFO,
-    'log_directory' => COMMON_BASE . '/log',
+    'log_directory' => '/tmp',
     'log_filename' => 'site_log',
 ));