developer system settings

bin/dbupdate.php

@@ -6,11 +6,11 @@
 	 * Tables must be updated manually, see htdocs/doc/sql/db-changes.txt
 	 */ 
   
-	require('htdocs/util/mysql_root/settings.inc.php');
+	require('htdocs/lib/settings.inc.php');
 	
   echo "importing data.sql ...\n";
   chdir ('htdocs/doc/sql');
-	system('cat static-data/data.sql | mysql -uroot --password=' . $db_root_password . ' opencaching');
+	system('cat static-data/data.sql | mysql -u' . $dbusername . ' --password=' . $dbpasswd . ' ' . $dbname);
 
   echo "importing triggers ...\n";
   chdir('stored-proc');