Sync-media: avoid empty source folders when rsyncing

diff --git a/share/hydractl/sync-media b/share/hydractl/sync-media
index 31e5fcd81edcc294539f38e6727c75310f19714b..a4fb69a691d6d88b101dfe6535ffc3c906eaba24 100755 (executable)
--- a/share/hydractl/sync-media
+++ b/share/hydractl/sync-media
@@ -239,7 +239,8 @@ 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
+      # Avoid empty source folders or those configured to be skipped
+      if [ ! -e "$CACHE/$folder/.sync-media/skip" ] && [ ! -z "`ls -1 $CACHE/$folder`" ]; then
         echo "Syncing $VOLUME/$MEDIA/$folder..."
         rsync -av --delete --exclude=.sync-media $CACHE/$folder/ $VOLUME/$MEDIA/$folder/
       fi
@@ -261,7 +262,8 @@ elif [ ! -z "$REMOTE" ]; then
       git annex sync
       )
     else
-      if [ ! -e "$CACHE/$folder/.sync-media/skip" ]; then
+      # Avoid empty source folders or those configured to be skipped
+      if [ ! -e "$CACHE/$folder/.sync-media/skip" ] && [ ! -z "`ls -1 $CACHE/$folder`" ]; then
         echo "Syncing $VOLUME/$MEDIA/$folder..."
         rsync -av --delete --exclude=.sync-media $CACHE/$folder/ $REMOTE.$DOMAIN:$CACHE/$folder/
       fi