summaryrefslogtreecommitdiff
path: root/installer/cli.php
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2013-03-19 16:41:42 +0000
committerNathan Kinkade <nath@nkinka.de>2013-03-19 16:41:42 +0000
commit3908e37d965fa76ea774e76ddf42365a872a5f27 (patch)
tree457e1a1e465f83855eee96ba287cd91f1623395c /installer/cli.php
parent711651f727e093cc7357a6bbff6bd992fd6dfd80 (diff)
parent1eab94f6062b5f54ea5d9db01d968e7195f3de9d (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'installer/cli.php')
-rw-r--r--installer/cli.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/installer/cli.php b/installer/cli.php
index f5a9e260..b31405f1 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -90,6 +90,7 @@ function parse_cli_params() {
"password" => "",
"dbname" => "gallery3",
"prefix" => "",
+ "g3_password" => "",
"type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
$argv = $_SERVER["argv"];
@@ -110,6 +111,9 @@ function parse_cli_params() {
case "-x":
$config["prefix"] = $argv[++$i];
break;
+ case "-g3p":
+ $config["g3_password"] = $argv[++$i];
+ break;
}
}