aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-11 15:35:39 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-11 15:35:39 -0300
commit6b47a2c3bc423caad723913dd373f645ff634ee9 (patch)
tree7641e7f040f347b474a16e5bd36dac1c4d136ede
parent86b694f25a02762663e9edb0763a7f4aa236497e (diff)
parent1b95fb70968f3b1aa05cd21ef1b1377630d5cf76 (diff)
downloadpuppet-backup-6b47a2c3bc423caad723913dd373f645ff634ee9.tar.gz
puppet-backup-6b47a2c3bc423caad723913dd373f645ff634ee9.tar.bz2
Merge branch 'master' into develop
-rw-r--r--files/sync-media12
1 files changed, 6 insertions, 6 deletions
diff --git a/files/sync-media b/files/sync-media
index a6e0ebe..c14510d 100644
--- a/files/sync-media
+++ b/files/sync-media
@@ -152,9 +152,9 @@ if [ -d "$CACHE" ]; then
)
fi
elif [ ! -d "$VOLUME/$MEDIA/$folder" ]; then
- if [ ! -e "$CACHE/$folder/.sync-media-skip" ]; then
+ if [ ! -e "$CACHE/$folder/.sync-media/skip" ]; then
echo "Syncing $VOLUME/$MEDIA/$folder..."
- rsync -av --delete $CACHE/$folder/ $VOLUME/$MEDIA/$folder/
+ rsync -av --delete --exclude=.sync-media $CACHE/$folder/ $VOLUME/$MEDIA/$folder/
fi
fi
done
@@ -197,9 +197,9 @@ if [ ! -z "$DRIVE" ] && [ -d "$VOLUME/$MEDIA" ]; then
#git annex drop --auto --numcopies=2
)
elif [ -d "$CACHE/$folder" ]; then
- if [ ! -e "$CACHE/$folder/.sync-media-skip" ]; then
+ if [ ! -e "$CACHE/$folder/.sync-media/skip" ]; then
echo "Syncing $VOLUME/$MEDIA/$folder..."
- rsync -av --delete $CACHE/$folder/ $VOLUME/$MEDIA/$folder/
+ rsync -av --delete --exclude=.sync-media $CACHE/$folder/ $VOLUME/$MEDIA/$folder/
fi
fi
done
@@ -221,9 +221,9 @@ elif [ ! -z "$REMOTE" ]; then
echo "No such remote $REMOTE"
fi
else
- if [ ! -e "$CACHE/$folder/.sync-media-skip" ]; then
+ if [ ! -e "$CACHE/$folder/.sync-media/skip" ]; then
echo "Syncing $VOLUME/$MEDIA/$folder..."
- rsync -av --delete $CACHE/$folder/ $REMOTE.$DOMAIN:$CACHE/$folder/
+ rsync -av --delete --exclude=.sync-media $CACHE/$folder/ $REMOTE.$DOMAIN:$CACHE/$folder/
fi
fi
done