Skip to content
Snippets Groups Projects
Commit e9e56a7a authored by micah's avatar micah :speech_balloon:
Browse files

Added escaping of double quotes that were added previously

parent 93c79dd0
No related branches found
No related tags found
No related merge requests found
...@@ -179,10 +179,10 @@ then ...@@ -179,10 +179,10 @@ then
else else
execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir" execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
fi fi
debug 'su $user -c "$execstr"' debug 'su $user -c \"$execstr\"'
if [ ! $test ] if [ ! $test ]
then then
output=`su $user -c "$execstr" 2>&1` output=`su $user -c \"$execstr\" 2>&1`
code=$? code=$?
if [ "$code" == "0" ] if [ "$code" == "0" ]
then then
...@@ -202,10 +202,10 @@ then ...@@ -202,10 +202,10 @@ then
else else
execstr="$MYSQLHOTCOPY --allowold $db $hotdir" execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
fi fi
debug 'su $user -c "$execstr"' debug 'su $user -c \"$execstr\"'
if [ ! $test ] if [ ! $test ]
then then
output=`su $user -c "$execstr" 2>&1` output=`su $user -c \"$execstr\" 2>&1`
code=$? code=$?
if [ "$code" == "0" ] if [ "$code" == "0" ]
then then
...@@ -230,14 +230,14 @@ then ...@@ -230,14 +230,14 @@ then
then then
if [ $usevserver = yes ] if [ $usevserver = yes ]
then then
debug '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` databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile\" | grep -v Database`
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
fatal "Authentication problem, maybe user/password is wrong" fatal "Authentication problem, maybe user/password is wrong"
fi fi
else 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 ] if [ $? -ne 0 ]
then then
fatal "Authentication problem, maybe user/password is wrong" fatal "Authentication problem, maybe user/password is wrong"
...@@ -253,10 +253,10 @@ fi ...@@ -253,10 +253,10 @@ fi
else else
execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql" execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
fi fi
debug 'su $user -c "$execstr"' debug 'su $user -c \"$execstr\"'
if [ ! $test ] if [ ! $test ]
then then
output=`su $user -c "$execstr" 2>&1` output=`su $user -c \"$execstr\" 2>&1`
code=$? code=$?
if [ "$code" == "0" ] if [ "$code" == "0" ]
then then
......
...@@ -72,9 +72,9 @@ chmod 700 $vroot$backupdir ...@@ -72,9 +72,9 @@ chmod 700 $vroot$backupdir
# if $databases = all, use pg_dumpall # if $databases = all, use pg_dumpall
if [ "$databases" == "all" ]; then if [ "$databases" == "all" ]; then
if [ $usevserver = yes ]; 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 else
execstr='su - postgres -c "$PGSQLDUMPALL > $backupdir/${localhost}-all.sql"' execstr='su - postgres -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\"'
fi fi
debug "$execstr" debug "$execstr"
if [ ! $test ]; then if [ ! $test ]; then
...@@ -94,9 +94,9 @@ else ...@@ -94,9 +94,9 @@ else
for db in $databases; do for db in $databases; do
if [ $usevserver = yes ] if [ $usevserver = yes ]
then 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 else
execstr='su - postgres -c "$PGSQLDUMP $db > $backupdir/${db}.sql"' execstr='su - postgres -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"'
fi fi
debug "$execstr" debug "$execstr"
if [ ! $test ]; then if [ ! $test ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment