diff options
| author | intrigeri <intrigeri@boum.org> | 2006-04-24 16:16:01 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2006-04-24 16:16:01 +0000 |
| commit | 806d97652f404adacb83bce8ff843d8dabc2bf00 (patch) | |
| tree | 5ed300a9e992e945cc72f9704631adba333439a3 | |
| parent | 3313ebbd62ab9b71fba375499a85e9bca87ba030 (diff) | |
| download | backupninja-806d97652f404adacb83bce8ff843d8dabc2bf00.tar.gz backupninja-806d97652f404adacb83bce8ff843d8dabc2bf00.tar.bz2 | |
pgsql: Fixed shell expansion, thanks Thomas Kotzian (Closes: #363297)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | handlers/pgsql | 12 |
2 files changed, 8 insertions, 7 deletions
@@ -6,13 +6,14 @@ version 0.9.4 -- unreleased Recursively ignore subdirs in /etc/backup.d (Closes: #361102) Added tar handler mysql: - . Fixed improper use of $vuserhome (Debian: #351083) + . Fixed improper use of $vuserhome (Closes: #351083) . Fixed erroneous removal of tmpfile when it didn't exit . Fixed inversed vsname emptiness check . Fixed su quote usage to be more posixy pgsql: . Fixed inversed vsname emptiness check . Fixed su quote usage to be more posixy + . Fixed shell expansion, thanks Thomas Kotzian (Closes: #363297) svn: . Fixed inversed vsname emptiness check rdiff: diff --git a/handlers/pgsql b/handlers/pgsql index 940f16b..b67b3f1 100644 --- a/handlers/pgsql +++ b/handlers/pgsql @@ -72,13 +72,13 @@ 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 - output=`$execstr 2>&1` + output=`eval $execstr 2>&1` code=$? if [ "$code" == "0" ]; then debug $output @@ -94,13 +94,13 @@ 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 - output=`$execstr 2>&1` + output=`eval $execstr 2>&1` code=$? if [ "$code" == "0" ]; then debug $output |