From 9ff634adfc148a74123fc9560cf6e87d8506a2b6 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Wed, 22 Jan 2014 10:19:52 -0600 Subject: [PATCH] oops: Fixup deploy for 1.8.1 and onward --- setup/cli/manage.php | 3 +-- setup/cli/modules/file.php | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setup/cli/manage.php b/setup/cli/manage.php index bfd59f9f0..83d715ac1 100755 --- a/setup/cli/manage.php +++ b/setup/cli/manage.php @@ -46,8 +46,7 @@ class Manager extends Module { if ($val == $action) unset($argv[$idx]); - foreach (glob(dirname(__file__).'/modules/*.php') as $script) - include_once $script; + require_once dirname(__file__)."/modules/{$args['action']}.php"; if (($module = Module::getInstance($action))) return $module->_run($args['action']); diff --git a/setup/cli/modules/file.php b/setup/cli/modules/file.php index 3c9f434b7..2c6aa49a1 100644 --- a/setup/cli/modules/file.php +++ b/setup/cli/modules/file.php @@ -48,6 +48,8 @@ class FileManager extends Module { function run($args, $options) { + if (!defined('OST_INSTALLED')) + $this->fail('Install your config file into `include/`'); Bootstrap::connect(); osTicket::start(); -- GitLab