X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=1bf4edb48ca75e103d6862145914f6f56b71f468;hb=e9e56a7af88cb07d453a94af1133bf0665f00ae3;hp=ae54aae7f2a2c0500b8999e03e043009e6eb7768;hpb=c8ebca79ad314975a4955bf42fe7705b0c20e9f3;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/mysql b/handlers/mysql index ae54aae..1bf4edb 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 @@ -230,14 +230,14 @@ then 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` + 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` 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