From 659faaa11978cac58d5fde4c0b03a0be4cce3c2b Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 3 Jun 2024 21:43:07 +0200
Subject: [PATCH] fix subvolume substitution

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

diff --git a/usr/lib/archboot/installer/btrfs.sh b/usr/lib/archboot/installer/btrfs.sh
index 8fc08da2c..dccec508b 100644
--- a/usr/lib/archboot/installer/btrfs.sh
+++ b/usr/lib/archboot/installer/btrfs.sh
@@ -70,7 +70,7 @@ _find_btrfs_bootloader_subvolume() {
 _subvolumes_in_use() {
     _SUBVOLUME_IN_USE=""
     while read -r i; do
-        echo "${i}" | grep -q "\|btrfs\|" && _SUBVOLUME_IN_USE="${_SUBVOLUME_IN_USE} $(echo "${i}" | cut -d '|' -f 9)"
+        echo "${i}" | grep -q "|btrfs|" && _SUBVOLUME_IN_USE="${_SUBVOLUME_IN_USE} $(echo "${i}" | cut -d '|' -f 9)"
     done < /tmp/.parts
 }
 
@@ -231,7 +231,7 @@ _choose_btrfs_subvolume () {
     _subvolumes_in_use
     for i in ${_SUBVOLUME_IN_USE}; do
         #shellcheck disable=SC2001,SC2086
-        _SUBVOLUMES="${_SUBVOLUMES//${i} _/}"
+        _SUBVOLUMES="${_SUBVOLUMES//${i}\ _/}"
     done
     if [[ -n "${_SUBVOLUMES}" ]]; then
         #shellcheck disable=SC2086