X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=check-subvol-stale;h=07926ef49e3af16535a2d62c915f37cd88552426;hp=cc032d41715425e07fd777c46bdf303bbffc6487;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=3174b9cb665b9a7b7ac8413a8e236cd236786632

diff --git a/check-subvol-stale b/check-subvol-stale
index cc032d4..07926ef 100644
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -57,7 +57,7 @@ while true; do
   esac
 done
 
-if [[ ! $@ ]]; then
+if [[ ! $1 ]]; then
   echo "$0: error: expected mountpoint argument"
 fi
 
@@ -88,7 +88,7 @@ for d; do
   d subvol_dir=$subvol_dir
   # note, we need $dev because $d might not be mounted, and we do this loop
   # because the device in fstab for the rootfs can be different.
-  for devx in $(btrfs fi show $dev| sed -rn 's#.*path (/\S+)$#\1#p'); do
+  for devx in $(btrfs fil show $dev| sed -rn 's#.*path (/\S+)$#\1#p'); do
     d devx=$devx
     root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab /etc/fstab|head -n1)
     if [[ $root_dir ]]; then
@@ -104,7 +104,7 @@ for d; do
   d "svp=$svp # subvolume path"
 
   snaps=($root_dir/btrbk/$subvol_dir.20*) # Assumes we are in the 21st century.
-  if [[ ! $snaps ]]; then
+  if [[ ! ${snaps[*]} ]]; then
     # no snapshots yet
     echo "$0: warning: no snapshots found at $root_dir/btrbk/$subvol_dir.20*. this is expected for a brand new volume"
     continue
@@ -161,7 +161,7 @@ for d; do
     if [[ $svp_cgen -ge $last_received_cgen ]]; then
       stale=false
     else
-      echo "$svp stale: it's gen at creation, $svp_cgen, is earlier than the last received snapshot, $last_received's gen at creation: $last_received_cgen"
+      d "$svp stale: it's gen at creation, $svp_cgen, is earlier than the last received snapshot, $last_received's gen at creation: $last_received_cgen"
       freshest_snap=$last_received
       stale=true
     fi