Avoid messing around with password. Execute MySQL commands directly (without pipe).

1 files changed, 3 insertions, 4 deletions

diff --git a/localdumpsql b/localdumpsql
index 27dcc35..64b90b9 100755
--- a/localdumpsql
+++ b/localdumpsql
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localdumpsql
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localdumpsql,v 1.3 2002-03-07 16:22:51 jonas Exp $
+# $Id: localdumpsql,v 1.4 2003-05-20 00:22:30 jonas Exp $
 #
 # MySQL/PostgreSQL maintenance script
 #
@@ -50,9 +50,8 @@ postgres_bin=/usr/lib/postgresql/bin/pg_dump
 
 # Define routines
 function mysql_valid()		{ [ -x $mysql_bin ]; }
-function mysql_get_pw()		{ grep password /root/.my.cnf | awk -F= '{print $2}' | head -1 | sed 's/^ //g'; }
-function mysql_list_db()	{ echo "show databases"|mysql -uroot -p`mysql_get_pw`|grep -v '^Database$'; }
-function mysql_dump_db()	{ $mysql_bin -c --add-drop-table -uroot -p`mysql_get_pw` $1; }
+function mysql_list_db()	{ mysql -uroot -e 'show databases' | grep -v '^Database$'; }
+function mysql_dump_db()	{ $mysql_bin -c --add-drop-table -uroot $1; }
 
 function postgres_valid()	{ [ -x $postgres_bin -a -x /usr/lib/postgresql/bin/pg_ctl ]; }
 function postgres_list_db()	{ su -s /bin/sh postgres -c "/usr/bin/psql -t -c 'select datname from pg_database order by datname' -d template1 | sed -e 's/ //' | grep -v '^template[01]$'"; }