cli: Fix crash deploying with --setup

Author: Jared Hancock

include/class.cli.php

@@ -232,8 +232,10 @@ function optionError($error) {
         die();
     }
 
-    function _run($module_name) {
+    function _run($module_name, $bootstrap=true) {
         $this->module_name = $module_name;
+        if ($bootstrap)
+            $this->bootstrap();
         $this->parseOptions();
         return $this->run($this->_args, $this->_options);
     }
@@ -242,6 +244,12 @@ function _run($module_name) {
     function run($args, $options) {
     }
 
+    function bootstrap() {
+        Bootstrap::loadConfig();
+        Bootstrap::defineTables(TABLE_PREFIX);
+        Bootstrap::loadCode();
+    }
+
     function fail($message) {
         $this->stderr->write($message . "\n");
         die();

include/cli/cli.inc.php

@@ -23,7 +23,4 @@
 
 require_once INCLUDE_DIR . "class.cli.php";
 
-Bootstrap::loadConfig();
-Bootstrap::defineTables(TABLE_PREFIX);
-Bootstrap::loadCode();
 Bootstrap::i18n_prep();

include/cli/modules/unpack.php

@@ -215,6 +215,11 @@ function get_include_dir() {
         return $location = rtrim($INCLUDE_DIR, '/').'/';
     }
 
+    function bootstrap() {
+        // Don't load config and frieds as that will likely crash if not yet
+        // installed
+    }
+
     function run($args, $options) {
         $this->destination = $args['install-path'];
         if (!is_dir($this->destination))

manage.php

@@ -80,5 +80,4 @@ function run($args, $options) {
 }
 
 $manager = new Manager();
-$manager->parseOptions();
-$manager->_run(basename(__file__));
+$manager->_run(basename(__file__), false);