mirror of
https://0xacab.org/liberate/backupninja.git
synced 2024-11-08 20:02:32 +01:00
pgsql: Fixed shell expansion, thanks Thomas Kotzian (Closes: #363297)
This commit is contained in:
parent
3313ebbd62
commit
806d97652f
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user