remove .json conf file if source subvolume is readonly (push-btrfs will not send it in that case)

1 files changed, 13 insertions, 6 deletions

diff --git a/src/push-btrfs-scan b/src/push-btrfs-scan
index bc97d00..06c5d42 100755
--- a/src/push-btrfs-scan
+++ b/src/push-btrfs-scan
@@ -40,13 +40,14 @@ is_our_snapshot()
 
 filter_readonly()
 {
-    if btrfs subvolume show -r "$id" / | sed -Ene '/^\tFlags:.*\breadonly\b/{p;q1}' -e '$q'
+    if btrfs subvolume show -r "$id" / | sed -Ene '/^\tFlags:.*\breadonly\b/q' -e '$q1'
     then
         if [ -e "$conf_name" ]
         then
-            printf '%20s %s\n' delete "$conf_name" >&2
+            printf '%20s %s\n' rm "$conf_name" >&2
+            rm "$conf_name"
         fi
-        printf '%20s %s\n' '(snapshot) lose' "$path_fixed" >&2
+        printf '%20s %s\n' '(readonly) lose' "$path_fixed" >&2
         return
     fi
     "$@"
@@ -58,7 +59,8 @@ filter_snapshot_filename()
     then
         if [ -e "$conf_name" ]
         then
-            printf '%20s %s\n' delete "$conf_name" >&2
+            printf '%20s %s\n' rm "$conf_name" >&2
+            rm "$conf_name"
         fi
         printf '%20s %s\n' '(snapshot) lose' "$path_fixed" >&2
         return
@@ -90,7 +92,7 @@ filter_blacklist()
                 printf '%20s %s\n' '(blacklist) lose' "$path_fixed" >&2
                 if [ -e "$conf_name" ]
                 then
-                    printf '%20s %s\n' delete "$conf_name" >&2
+                    printf '%20s %s\n' rm "$conf_name" >&2
                     rm "$conf_name"
                 fi
                 timer=$destination_host$(systemd-escape "$path_fixed").timer
@@ -188,4 +190,9 @@ esac
 
 ssh root@"$destination_host" true || read -p 'Could not log in.  Continue? '
 
-with_subvolumes fixup_path compute_paths filter_snapshot_filename filter_blacklist mirror
+with_subvolumes fixup_path \
+                compute_paths \
+                filter_snapshot_filename \
+                filter_readonly \
+                filter_blacklist \
+                mirror