various fixes and updates

[distro-setup] / check-subvol-stale

diff --git a/check-subvol-stale b/check-subvol-stale
index 8d9ac786c6b71644df4708f58b2f88f112caf692..d514bafa8ed22d047f751cb28a972f3724d0ea16 100644 (file)
--- 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
 
@@ -104,8 +104,9 @@ 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
+    # TODO: make this an error and override with a cli flag
     echo "$0: warning: no snapshots found at $root_dir/btrbk/$subvol_dir.20*. this is expected for a brand new volume"
     continue
   fi