X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fpgsql;h=dd1a2ea90b16b3a4d827de0feee26b500ef6ad3d;hb=921babdf413f370acccc5e125a2c37fbdd18afd3;hp=3f7d0b9ac943e38b5f5c82f5318156c44b0420ab;hpb=49dfbcb81f79772c2283a9637eee49616b0b5ac8;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/pgsql b/handlers/pgsql
index 3f7d0b9..dd1a2ea 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -30,7 +30,7 @@ if [ $usevserver ]; then
     [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
     # is it running ?
     running=`$VSERVERINFO $vsname RUNNING`
-    if [ $running = 1 ]; then
+    if [ "$running" = "1" ]; then
 	if [ "$databases" == "all" ]; then
 	    [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \
 		fatal "Can't find $PGSQLDUMPALL in vserver $vsname."
@@ -58,7 +58,7 @@ fi
 
 # give backup dir the good uid and permissions
 # (in respect to the vserver, if $usevserver)
-pguid=`grep '^postgres:' $vroot/etc/passwd | awk -F: '{print $3}'`
+pguid=`getent passwd postgres | awk -F: '{print $3}'`
 [ -n "$pguid" ] || \
     fatal "No user called postgres`[ $usevserver != 1 ] || echo \" on vserver $vsname\"`."
 debug "chown $pguid $vroot$backupdir"
@@ -69,14 +69,14 @@ chmod 700 $vroot$backupdir
 # if $databases = all, use pg_dumpall
 if [ "$databases" == "all" ]; then
     if [ $usevserver ]; then
-	execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $vroot$backupdir/${vsname}.sql"
+	execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql"
     else
 	execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql"
     fi
     debug "$execstr"
     if [ ! $test ]; then
-	output=`$execstr 2>&1`
-	code=$?
+       output=`$execstr 2>&1`
+       code=$?
 	if [ "$code" == "0" ]; then
 	    debug $output
 	    info "Successfully finished dump of pgsql cluster"
@@ -91,7 +91,7 @@ else
     for db in $databases; do
 	if [ $usevserver ]
 	    then
-	    execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $vroot$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"
 	fi