From: intrigeri Date: Sat, 8 Apr 2006 10:31:14 +0000 (+0000) Subject: r4446@krups: intrigeri | 2006-04-08 12:28:59 +0200 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=2a1b3e5cd2d6784cb4fcbe3c8a399b36e29cf8d0;p=matthijs%2Fupstream%2Fbackupninja.git r4446@krups: intrigeri | 2006-04-08 12:28:59 +0200 mysql handler: removed over-enthusiastic quote-escaping, related to su ; previous versions broke the mysql handler both on sarge and sid. git-svn-id: http://code.autistici.org/svn/backupninja/trunk@379 758a04ac-41e6-0310-8a23-8373a73cc35d --- diff --git a/handlers/mysql b/handlers/mysql index 1bf4edb..2dcf2d5 100644 --- a/handlers/mysql +++ b/handlers/mysql @@ -179,10 +179,10 @@ then else execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir" fi - debug 'su $user -c \"$execstr\"' + debug 'su $user -c "$execstr"' if [ ! $test ] then - output=`su $user -c \"$execstr\" 2>&1` + output=`su $user -c "$execstr" 2>&1` code=$? if [ "$code" == "0" ] then @@ -202,10 +202,10 @@ then else execstr="$MYSQLHOTCOPY --allowold $db $hotdir" fi - debug 'su $user -c \"$execstr\"' + debug 'su $user -c "$execstr"' if [ ! $test ] then - output=`su $user -c \"$execstr\" 2>&1` + output=`su $user -c "$execstr" 2>&1` code=$? if [ "$code" == "0" ] then @@ -231,13 +231,13 @@ then if [ $usevserver = yes ] then debug 'echo show databases | $VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile\" | grep -v Database' - databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile\" | grep -v Database` + databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database` if [ $? -ne 0 ] then fatal "Authentication problem, maybe user/password is wrong" fi else - databases=`echo 'show databases' | su $user -c \"$MYSQL $defaultsfile\" | grep -v Database` + databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database` if [ $? -ne 0 ] then fatal "Authentication problem, maybe user/password is wrong" @@ -253,10 +253,10 @@ fi else execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql" fi - debug 'su $user -c \"$execstr\"' + debug 'su $user -c "$execstr"' if [ ! $test ] then - output=`su $user -c \"$execstr\" 2>&1` + output=`su $user -c "$execstr" 2>&1` code=$? if [ "$code" == "0" ] then