aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Janssen -- Sig-I/O Automatisering <mark@sig-io.nl>2014-06-11 14:44:29 +0200
committerintrigeri <intrigeri@boum.org>2014-06-14 13:47:05 +0000
commit21bcb7e6bd0a4b226e9932691736802189d33238 (patch)
tree60ea176c9fc873d3421afcd32d91f23731aee9a1
parent4377caaf0891e685fbc0911dcee525718db0cd00 (diff)
downloadbackupninja-21bcb7e6bd0a4b226e9932691736802189d33238.tar.gz
backupninja-21bcb7e6bd0a4b226e9932691736802189d33238.tar.bz2
Ignore files ending in ~
-rwxr-xr-xsrc/backupninja.in2
-rwxr-xr-xsrc/ninjahelper.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backupninja.in b/src/backupninja.in
index 0901742..c3733cf 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -544,7 +544,7 @@ errormsg=""
if [ "$singlerun" ]; then
files=$singlerun
else
- files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
+ files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' ! -name '*~' | sort -n`
if [ -z "$files" ]; then
info "No backup actions configured in '$configdirectory', run ninjahelper!"
diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 2a7faa9..4b4dceb 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -240,7 +240,7 @@ while true; do
menulist=
action=
let "i = 1"
-for file in `find ${configdirectory} -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do
+for file in `find ${configdirectory} -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' ! -name '*~' | sort -n`; do
menulist="$menulist $i $file"
actions[$i]=$file
let "i += 1"