aboutsummaryrefslogtreecommitdiff
path: root/handlers
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2006-03-20 23:08:07 +0000
committerMicah Anderson <micah@riseup.net>2006-03-20 23:08:07 +0000
commit8f7a366d32296c68fb70c740c6143fec5487df2f (patch)
treeaaaa0a724d3bdd54c4805c5fa9b838476d35b297 /handlers
parent0e353b42dba44211f42108c29f3f9169aecf4e54 (diff)
downloadbackupninja-8f7a366d32296c68fb70c740c6143fec5487df2f.tar.gz
backupninja-8f7a366d32296c68fb70c740c6143fec5487df2f.tar.bz2
Fixed su quoting usage, as outlined here:
http://lists.debian.org/debian-devel-announce/2006/03/msg00003.html
Diffstat (limited to 'handlers')
-rw-r--r--handlers/mysql8
-rw-r--r--handlers/pgsql8
2 files changed, 8 insertions, 8 deletions
diff --git a/handlers/mysql b/handlers/mysql
index ae54aae..4bfffbb 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -179,7 +179,7 @@ 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`
@@ -202,7 +202,7 @@ 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`
@@ -230,7 +230,7 @@ then
then
if [ $usevserver = yes ]
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`
if [ $? -ne 0 ]
then
@@ -253,7 +253,7 @@ 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`
diff --git a/handlers/pgsql b/handlers/pgsql
index c7197a8..e9d40cf 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -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