Fix a bashism and some minor bugs in nuke-graph-directory.sh

Gbp-Pq: Name 9637-fix-nuke-bashism.patch

diff --git a/contrib/nuke-graph-directory.sh b/contrib/nuke-graph-directory.sh
index f44c45a17464265d3be0f960982ff8a7d7f9664c..8d12a9d6460d0a263c860c39c4b82eb93f134d21 100755 (executable)
--- a/contrib/nuke-graph-directory.sh
+++ b/contrib/nuke-graph-directory.sh
@@ -50,9 +50,10 @@ for mount in $(awk '{ print $5 }' /proc/self/mountinfo); do
 done
 
 # now, let's go destroy individual btrfs subvolumes, if any exist
-if command -v btrfs &> /dev/null; then
+if command -v btrfs > /dev/null 2>&1; then
        root="$(df "$dir" | awk 'NR>1 { print $NF }')"
-       for subvol in $(btrfs subvolume list -o "$root" 2>/dev/null | awk -F' path ' '{ print $2 }'); do
+       root="${root#/}" # if root is "/", we want it to become ""
+       for subvol in $(btrfs subvolume list -o "$root/" 2>/dev/null | awk -F' path ' '{ print $2 }' | sort -r); do
                subvolDir="$root/$subvol"
                if dir_in_dir "$subvolDir" "$dir"; then
                        ( set -x; btrfs subvolume delete "$subvolDir" )