From 5c336a0b73ad295c7aa1c7deec6c782aefcb35bc Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 29 Jun 2024 11:27:42 +0200
Subject: [PATCH] fix subvolume creation

---
 usr/lib/archboot/installer/btrfs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/lib/archboot/installer/btrfs.sh b/usr/lib/archboot/installer/btrfs.sh
index bf2a04c87..c7a502314 100644
--- a/usr/lib/archboot/installer/btrfs.sh
+++ b/usr/lib/archboot/installer/btrfs.sh
@@ -235,7 +235,8 @@ _choose_btrfs_subvolume () {
     for i in ${_SUBVOLUME_IN_USE}; do
         _SUBVOLUMES="${_SUBVOLUMES//${i} _/}"
     done
-    if [[ -n "${_SUBVOLUMES}" && ! "${_SUBVOLUMES}" == " " ]]; then
+    _SUBVOLUMES="$(echo "${_SUBVOLUMES}" | sd ' +$' '')"
+    if [[ -n "${_SUBVOLUMES}" ]]; then
         #shellcheck disable=SC2086
         _dialog --title " Subvolume " --no-cancel --menu "" 15 50 13 ${_SUBVOLUMES} 2>"${_ANSWER}" || return 1
         _BTRFS_SUBVOLUME=$(cat "${_ANSWER}")