join debugging

[infobot.git] / setup / setup.pl

diff --git a/setup/setup.pl b/setup/setup.pl
index 177b2e24ba08bb3b55efafda5f3660b33b88be11..89393bd1fc1039e92cd98107d01e277e81b70e22 100755 (executable)
--- a/setup/setup.pl
+++ b/setup/setup.pl
@@ -1,99 +1,111 @@
 #!/usr/bin/perl
-# setup_tables: setup MYSQL/PGSQL side of things for blootbot.
+# setup_tables: setup MYSQL/PGSQL side of things for infobot.
 # written by the xk.
 ###
 
-require "src/core.pl";
 require "src/logger.pl";
+require "src/core.pl";
 require "src/modules.pl";
 require "src/Misc.pl";
-require "src/interface.pl";
+require "src/CLI/Support.pl";
+
+$bot_src_dir = "src/";
 
-$bot_src_dir = "./src/";
+# read param stuff from infobot.config.
+&loadConfig("files/infobot.config");
 
-# read param stuff from blootbot.config.
-&loadConfig("files/blootbot.config");
 &loadDBModules();
 my $dbname = $param{'DBName'};
 my $query;
 
-if ($dbname eq "") {
-  print "error: appears that teh config file was not loaded properly.\n";
-  exit 1;
+if ( $dbname eq "" ) {
+    print "error: appears that the config file was not loaded properly.\n";
+    exit 1;
 }
 
-if ($param{'DBType'} =~ /mysql/i) {
+if ( $param{'DBType'} =~ /mysql/i ) {
     use DBI;
 
     print "Enter root information...\n";
+
     # username.
     print "Username: ";
-    chop (my $adminuser = <STDIN>);
+    chop( my $adminuser = <STDIN> );
 
     # passwd.
     system "stty -echo";
     print "Password: ";
-    chop(my $adminpass = <STDIN>);
+    chop( my $adminpass = <STDIN> );
     print "\n";
     system "stty echo";
 
-    if ($adminuser eq "" or $adminpass eq "") {
-       &ERROR("error: adminuser || adminpass is NULL.");
-       exit 1;
+    if ( $adminuser eq "" or $adminpass eq "" ) {
+        &ERROR("error: adminuser || adminpass is NULL.");
+        exit 1;
     }
 
-    &openDB("mysql", $adminuser, $adminpass);
+    &sqlOpenDB( "mysql", "mysql", $adminuser, $adminpass );
 
     my $database_exists = 0;
-    foreach $database (&dbRawReturn("SHOW DATABASES")) {
-       $database_exists++ if $database eq $param{DBName};
+    foreach $database ( &sqlRawReturn("SHOW DATABASES") ) {
+        $database_exists++ if $database eq $param{DBName};
     }
     if ($database_exists) {
-       &status("Hmm, database '$param{DBName}' already exists. Continuing...");
-    } else {
-       &status("Creating db ...");
-       &dbRaw("create(database)", "CREATE DATABASE $param{DBName}");
+        &status("Database '$param{DBName}' already exists. Continuing...");
+    }
+    else {
+        &status("Creating db ...");
+        &sqlRaw( "create(database)", "CREATE DATABASE $param{DBName}" );
     }
 
-    &status("Creating db ...");
-    &dbRaw("CREATE DATABASE $param{'DBName'}");
-
-    &status("--- Adding user information.");
+    &status("--- Adding user information for user '$param{'SQLUser'}'");
 
-    if (!&dbGet("user","user", "user=".&dbQuote($param{'SQLUser'}) ) ) {
-       &status("--- Adding user $param{'SQLUser'} $dbname/user table...");
+    if (
+        !&sqlSelect(
+            "user", "user", { 'user' => &sqlQuote( $param{'SQLUser'} ) }
+        )
+      )
+    {
+        &status("--- Adding user '$param{'SQLUser'}' $dbname/user table...");
 
-       $query = "INSERT INTO user VALUES ".
-               "('localhost', '$param{'SQLUser'}', ".
-               "password('$param{'SQLPass'}'), ";
+        $query =
+            "INSERT INTO user VALUES "
+          . "('localhost', '$param{'SQLUser'}', "
+          . "password('$param{'SQLPass'}'), ";
 
-       $query .= "'Y','Y','Y','Y','Y','Y','N','N','N','N','N','N','N','N')";
+        $query .= "'Y','Y','Y','Y','Y','Y','N','N','N','N','N','N','N','N')";
 
-       &dbRaw("create(user)", $query);
-    } else {
-       &status("... User information already present.");
+        &sqlRaw( "create(user)", $query );
+    }
+    else {
+        &status("... user information already present.");
     }
 
-    if (!&dbGet("db","db","db=".&dbQuote($param{'SQLUser'}) ) ) {
-       &status("--- Adding 'db' stuff.");
+    if ( !&sqlSelect( "db", "db", { 'db' => &sqlQuote( $param{'SQLUser'} ) } ) )
+    {
+        &status("--- Adding database information for database '$dbname'.");
 
-       $query = "INSERT INTO db VALUES ".
-               "('localhost', '$dbname', ".
-               "'$param{'SQLUser'}', ";
+        $query =
+            "INSERT INTO db VALUES "
+          . "('localhost', '$dbname', "
+          . "'$param{'SQLUser'}', ";
 
-       $query .= "'Y','Y','Y','Y','Y','Y','Y','N','N','N')";
+        $query .= "'Y','Y','Y','Y','Y','Y','Y','N','N','N')";
 
-       &dbRaw("create(db)", $query);
-    } else {
-       &status("... db info already present.");
+        &sqlRaw( "create(db)", $query );
+    }
+    else {
+        &status("... db info already present.");
     }
 
     # flush.
     &status("Flushing privileges...");
     $query = "FLUSH PRIVILEGES";
-    &dbRaw("mysql(flush)", $query);
+    &sqlRaw( "mysql(flush)", $query );
 }
 
 &status("Done.");
 
-&closeDB();
+&sqlCloseDB();
+
+# vim:ts=4:sw=4:expandtab:tw=80