Support for .sync-media folder at sync-media

diff --git a/files/sync-media b/files/sync-media
index 6fba1149157d64dec333e5d6d0b5876693b6a42f..3cffa5b283c81f6d8c1643c563f3a80cc4f41880 100644 (file)
--- a/files/sync-media
+++ b/files/sync-media
@@ -142,9 +142,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
@@ -187,9 +187,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
@@ -211,9 +211,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