X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=setup%2Fsetup.pl;h=c9562aebdddd78b156671b58db35ae6c3d2177ab;hb=cb81fea9939f349b36e3b5a0cdc0343a6b781da1;hp=22ad599bc39ebeb2c1d65e601bd0dfeaa4872593;hpb=130fc9d79663d571b32c8a625e3487e7b42c10da;p=infobot.git

diff --git a/setup/setup.pl b/setup/setup.pl
index 22ad599..c9562ae 100755
--- a/setup/setup.pl
+++ b/setup/setup.pl
@@ -1,24 +1,25 @@
 #!/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";
+  print "error: appears that the config file was not loaded properly.\n";
   exit 1;
 }
 
@@ -42,22 +43,22 @@ if ($param{'DBType'} =~ /mysql/i) {
 	exit 1;
     }
 
-    &openDB("mysql", $adminuser, $adminpass);
+    &sqlOpenDB("mysql", "mysql", $adminuser, $adminpass);
 
     my $database_exists = 0;
-    foreach $database (&dbRawReturn("SHOW DATABASES")) {
+    foreach $database (&sqlRawReturn("SHOW DATABASES")) {
 	$database_exists++ if $database eq $param{DBName};
     }
     if ($database_exists) {
 	&status("Database '$param{DBName}' already exists. Continuing...");
     } else {
 	&status("Creating db ...");
-	&dbRaw("create(database)", "CREATE DATABASE $param{DBName}");
+	&sqlRaw("create(database)", "CREATE DATABASE $param{DBName}");
     }
 
     &status("--- Adding user information for user '$param{'SQLUser'}'");
 
-    if (!&dbGet("user","user", "user=".&dbQuote($param{'SQLUser'}) ) ) {
+    if (!&sqlSelect("user", "user", { 'user' => &sqlQuote($param{'SQLUser'}) })) {
 	&status("--- Adding user '$param{'SQLUser'}' $dbname/user table...");
 
 	$query = "INSERT INTO user VALUES ".
@@ -66,12 +67,12 @@ if ($param{'DBType'} =~ /mysql/i) {
 
 	$query .= "'Y','Y','Y','Y','Y','Y','N','N','N','N','N','N','N','N')";
 
-	&dbRaw("create(user)", $query);
+	&sqlRaw("create(user)", $query);
     } else {
 	&status("... user information already present.");
     }
 
-    if (!&dbGet("db","db","db=".&dbQuote($param{'SQLUser'}) ) ) {
+    if (!&sqlSelect("db", "db", { 'db' => &sqlQuote($param{'SQLUser'}) })) {
 	&status("--- Adding database information for database '$dbname'.");
 
 	$query = "INSERT INTO db VALUES ".
@@ -80,7 +81,7 @@ if ($param{'DBType'} =~ /mysql/i) {
 
 	$query .= "'Y','Y','Y','Y','Y','Y','Y','N','N','N')";
 
-	&dbRaw("create(db)", $query);
+	&sqlRaw("create(db)", $query);
     } else {
 	&status("... db info already present.");
     }
@@ -88,9 +89,11 @@ if ($param{'DBType'} =~ /mysql/i) {
     # 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