allow modules to be installed to be specified as command line option or in the response file

2 files changed, 12 insertions, 2 deletions

diff --git a/installer/helpers/installer.php b/installer/helpers/installer.php
index f4ce5057..3fd8b19f 100644
--- a/installer/helpers/installer.php
+++ b/installer/helpers/installer.php
@@ -189,6 +189,9 @@ class installer {
       case "-f":
         $arguments["file"] = $argv[++$i];
         break;
+      case "-i":
+        $arguments["type"] = $argv[++i];
+        break;
       case "-m":
         $arguments["modules"] = $argv[++$i];
         break;
@@ -196,7 +199,7 @@ class installer {
     }
 
     $config = array("host" => "localhost", "user" => "root", "password" => "",
-                    "modules" => array("core" => 1, "user" => 1),
+                    "modules" => array("core" => 1, "user" => 1), "type" => "mysqli",
                     "dbname" => "gallery3", "prefix" => "");
 
     if (!empty($arguments["file"])) {
@@ -234,7 +237,12 @@ class installer {
     self::$messages[] = $section;
  
   }
-  
+
+  public static function get_database() {
+    $db_config = array();
+    return 
+  }
+
   private static function _render($view) {
     if ($view == '')
       return;
diff --git a/installer/install.php b/installer/install.php
index a644b1c9..7abea163 100644
--- a/installer/install.php
+++ b/installer/install.php
@@ -25,7 +25,9 @@
  * -u     Database user          (default: root)
  * -p     Database user password (default: )
  * -d     Database name          (default: gallery3)
+ * -i     Database type          (default: mysqli)
  * -t     Table prefix           (default: )
+ * -m     Modules to install     (default: core, user)
  * -f     Response file          (default: not used)
  *        The response file is a php file that contains the following syntax;
  *        $config[key] = value;