From d44cf258940ef6c17d452de872d02e75e0d36a03 Mon Sep 17 00:00:00 2001
From: mpl <mathieu.lonjaret@gmail.com>
Date: Thu, 7 Mar 2013 21:44:28 +0100
Subject: [PATCH] dev-server: camdbinit is now camtool dbinit

Change-Id: I6e59c831b85b5abe3a4727d8da13e08762ef1a99
---
 dev-server | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-server b/dev-server
index a7a5c75a1..5dec14396 100755
--- a/dev-server
+++ b/dev-server
@@ -74,13 +74,13 @@ unless ($opt_fast) {
 $ENV{CAMLI_HTTP_DEBUG} = 1 if $opt_verbose;
 
 my $camlistored;
-my $camdbinit; # closure to return path
+my $camtool; # closure to return path
 if ($opt_nobuild) {
     $camlistored = find_bin("./server/camlistored");
-    $camdbinit = sub { scalar find_bin("./cmd/camdbinit") };
+    $camtool = sub { scalar find_bin("./cmd/camtool") };
 } else {
     $camlistored = build_bin("./server/camlistored");
-    $camdbinit = sub { scalar  build_bin("./cmd/camdbinit") };
+    $camtool = sub { scalar  build_bin("./cmd/camtool") };
 }
 
 my $root = "/tmp/camliroot-$ENV{USER}/port$port/";
@@ -122,22 +122,24 @@ if ($opt_memory) {
 } elsif ($opt_postgres) {
     $ENV{"CAMLI_POSTGRES_ENABLED"} = "true";
     $ENV{"CAMLI_INDEXER_PATH"} = "/index-postgres/";
-    system($camdbinit->(),
+    system($camtool->(),
+           "dbinit",
            "-postgres",
            "-user=postgres",
            "-password=postgres",
            "-host=localhost",
-           "-database=$DBNAME",
-           @opts) and die "Failed to run camdbinit.\n";
+           "-dbname=$DBNAME",
+           @opts) and die "Failed to run camtool dbinit.\n";
 } else {
     $ENV{"CAMLI_MYSQL_ENABLED"} = "true";
     $ENV{"CAMLI_INDEXER_PATH"} = "/index-mysql/";
-    system($camdbinit->(),
+    system($camtool->(),
+           "dbinit",
            "-user=root",
            "-password=root",
            "-host=localhost",
-           "-database=$DBNAME",
-           @opts) and die "Failed to run camdbinit.\n";
+           "-dbname=$DBNAME",
+           @opts) and die "Failed to run camtool dbinit.\n";
 }
 
 my $base = "http://localhost:$port";