From 0b9fe18a6bf4036a05db7f9479d7b55d3fe5c782 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 27 Feb 2009 19:26:21 +0000
Subject: Both the command line and web installer installer now supports
 creating tables with a table prefix. There are still some queries that
 haven't been converted, so don't start using prefixes yet.  However, if you
 do, you can login and modify the user profile.

---
 installer/cli.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'installer/cli.php')

diff --git a/installer/cli.php b/installer/cli.php
index ee2d6880..163f2e71 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -40,7 +40,7 @@ if (!installer::connect($config)) {
        "Please specify an empty database.\n");
 } else if (!installer::unpack_var()) {
   oops("Unable to create files inside the 'var' directory");
-} else if (!installer::unpack_sql()) {
+} else if (!installer::unpack_sql($config)) {
   oops("Failed to create database tables\n" . mysql_error());
 } else if (!installer::create_database_config($config)) {
   oops("Couldn't create var/database.php");
@@ -54,7 +54,7 @@ if (!installer::connect($config)) {
     print "  password: $password\n";
     print "\n";
 
-    installer::create_private_key();
+    installer::create_private_key($config);
     exit(0);
   } catch (Exception $e) {
     oops($e->getMessage());
@@ -96,6 +96,9 @@ function parse_cli_params() {
     case "-p":
       $config["password"] = $argv[++$i];
       break;
+    case "-x":
+      $config["prefix"] = $argv[++$i];
+      break;
     }
   }
 
-- 
cgit v1.2.3