X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=e5c55aea505aef9912feafa5cb91ddc95fe42465;hb=cf1817d075b934aeab77d7bf10da3bf886b034ae;hp=aba997e50a4de87e44f17728cbc19a051eaf6305;hpb=a95af249f142f7feb253c34687cfc415a0614d41;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/backupninja b/backupninja
index aba997e..e5c55ae 100755
--- a/backupninja
+++ b/backupninja
@@ -279,8 +279,10 @@ function process_action() {
 	getconf when "$defaultwhen"
 	if [ "$processnow" == 1 ]; then
 		info ">>>> starting action $file (because of --now)"
+		run="yes"
 	elif [ "$when" == "hourly" ]; then
 		info ">>>> starting action $file (because 'when = hourly')"
+		run="yes"
 	else
 		IFS=$'\t\n'
 		for w in $when; do
@@ -297,6 +299,7 @@ function process_action() {
 		done
 		IFS=$' \t\n'
 	fi
+	debug $run
 	[ "$run" == "no" ] && return
 	
 	let "actions_run += 1"
@@ -435,6 +438,8 @@ getconf RDIFFBACKUP /usr/bin/rdiff-backup
 getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
 getconf MYSQLDUMP /usr/bin/mysqldump
+getconf PGSQLDUMP /usr/bin/pg_dump
+getconf PGSQLDUMPALL /usr/bin/pg_dumpall
 getconf GZIP /bin/gzip
 getconf RSYNC /usr/bin/rsync
 getconf vservers no
@@ -474,7 +479,7 @@ errormsg=""
 if [ "$singlerun" ]; then
 	files=$singlerun
 else
-	files=`find $configdirectory -mindepth 1 | sort -n`
+	files=`find $configdirectory ! -name '.*.swp' -mindepth 1 | sort -n`
 fi
 
 for file in $files; do