Added escaping of double quotes that were added previously

This commit is contained in:
Micah Anderson 2006-03-25 20:14:03 +00:00
parent 93c79dd085
commit e9e56a7af8
2 changed files with 13 additions and 13 deletions

View File

@ -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

View File

@ -72,9 +72,9 @@ chmod 700 $vroot$backupdir
# if $databases = all, use pg_dumpall
if [ "$databases" == "all" ]; then
if [ $usevserver = yes ]; then
execstr='$VSERVER $vsname exec su - postgres -c "$PGSQLDUMPALL > $backupdir/${vsname}.sql"'
execstr='$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\"'
else
execstr='su - postgres -c "$PGSQLDUMPALL > $backupdir/${localhost}-all.sql"'
execstr='su - postgres -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\"'
fi
debug "$execstr"
if [ ! $test ]; then
@ -94,9 +94,9 @@ else
for db in $databases; do
if [ $usevserver = yes ]
then
execstr='$VSERVER $vsname exec su - postgres -c "$PGSQLDUMP $db > $backupdir/${db}.sql"'
execstr='$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"'
else
execstr='su - postgres -c "$PGSQLDUMP $db > $backupdir/${db}.sql"'
execstr='su - postgres -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"'
fi
debug "$execstr"
if [ ! $test ]; then