BUILD : 1.7.10 (814) BUGS : 381 NOTES : Removed a double extern definition of rdb_tag_table; Fixed mydbgen so it sends the pass and installs in the data dir

git-svn-id: svn://svn.anope.org/anope/trunk@814 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@567 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 10 insertions, 10 deletions

diff --git a/src/Makefile b/src/Makefile
index 4627127c0..a467256fd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -107,12 +107,12 @@ install: services
 	test -d ${BINDEST} || mkdir ${BINDEST}
 	$(INSTALL) services $(BINDEST)/services
 	$(INSTALL) bin/anoperc $(BINDEST)/anoperc
-	$(INSTALL) bin/mydbgen $(BINDEST)/mydbgen
 	rm -f $(BINDEST)/listnicks $(BINDEST)/listchans
 	ln $(BINDEST)/services $(BINDEST)/listnicks
 	ln $(BINDEST)/services $(BINDEST)/listchans
 	(cd ../lang ; $(MAKE) install)
 	$(CP) ../data/* $(DATDEST)
+	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
 	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
 	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
 	@if [ "$(MODULE_PATH)" ] ; then \
diff --git a/src/bin/mydbgen b/src/bin/mydbgen
index d19042f56..e513a4917 100755
--- a/src/bin/mydbgen
+++ b/src/bin/mydbgen
@@ -88,16 +88,16 @@ while [ -z "$SQLDB" ] ; do
         fi
 done
 
-MYSQLDUMP="mysqldump -h$SQLHOST -u$SQLUSER $SQLDB"
-MYSQLSHOW="mysqlshow -h$SQLHOST -u$SQLUSER $SQLDB"
-MYSQL="mysql -h$SQLHOST -u$SQLUSER $SQLDB"
+MYSQLDUMP="mysqldump -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
+MYSQLSHOW="mysqlshow -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
+MYSQL="mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
 
 echo ""
 
 $MYSQLSHOW | grep -q $SQLDB
 if test "$?" = "1" ; then
 	echo -n "Unable to find databse, creating... "
-	mysql -h$SQLHOST -u$SQLUSER -Bs -e "create database $SQLDB" >/dev/null 2>&1
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS -Bs -e "create database $SQLDB" >/dev/null 2>&1
 	if test "$?" = "0" ; then
 		echo "done!"
 	else
@@ -122,7 +122,7 @@ else
 	if test "$?" = "1" ; then
 		echo -n "Unable to find Anope info table, creating... "
 		echo "CREATE TABLE anope_info (version int, date datetime) TYPE=MyISAM" > $TFILE
-		mysql -h$SQLHOST -u$SQLUSER $SQLDB < $TFILE >/dev/null 2>&1
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
 		if test "$?" = "0" ; then
 			echo "done!"
 
@@ -142,7 +142,7 @@ else
 	if test "$?" = "1" ; then
 		echo -n "Unable to find anope_cs_info.memomax, altering... "
 		echo "ALTER TABLE anope_cs_info ADD memomax smallint unsigned NOT NULL default 0" > $TFILE
-		mysql -h$SQLHOST -u$SQLUSER $SQLDB < $TFILE >/dev/null 2>&1
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
 		if test "$?" = "0" ; then
 			echo "done!"
 
@@ -157,7 +157,7 @@ else
 	if test "$?" = "1" ; then
 		echo -n "Unable to find anope_cs_info.ttb, altering... "
 		echo "ALTER TABLE anope_cs_info ADD ttb smallint NOT NULL default 0" > $TFILE
-		mysql -h$SQLHOST -u$SQLUSER $SQLDB < $TFILE >/dev/null 2>&1
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
 		if test "$?" = "0" ; then
 			echo "done!"
 
@@ -170,12 +170,12 @@ else
 	# Introduced on Anope 1.7.7 -> status smallint to inst unsigned.
 	echo "Blindly altering status for bigger capacity... "
 	echo "ALTER TABLE anope_ns_alias CHANGE status status int(11) unsigned NOT NULL default 0" > $TFILE
-	mysql -h$SQLHOST -u$SQLUSER $SQLDB < $TFILE >/dev/null 2>&1
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
 
 	# Introduced on Anope 1.7.8 (620) proxy scanner removed.
 	echo "Removing proxy scanner cache... "
 	echo "DROP TABLE IF EXISTS anope_os_cache" > $TFILE
-	mysql -h$SQLHOST -u$SQLUSER $SQLDB < $TFILE >/dev/null 2>&1
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
 
 	echo "done!"