From e2f41d724f411b306596b61db8347d1a9e162ac2 Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sun, 23 Jul 2023 20:36:31 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Bei=20den=20Input-Statments=20die=20richtig?=
 =?UTF-8?q?e=20option=20hinzugef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.uefi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.uefi b/install.uefi
index f51325d..9c8b545 100644
--- a/install.uefi
+++ b/install.uefi
@@ -107,7 +107,7 @@ CHECK_ESP=$(echo "${CHECK_PARTITIONS_OUTPUT}" | grep -c "c12a7328-f81f-11d2-ba4b
 CHECK_USR=$(echo "${CHECK_PARTITIONS_OUTPUT}" | grep -c "8484680c-9521-48c6-9c11-b0720656f69e")
 CHECK_USRHASH=$(echo "${CHECK_PARTITIONS_OUTPUT}" | grep -c "77ff5f63-e7b6-4633-acf4-1565b864c0e6")
 if [[ ${CHECK_ESP} -eq 1 && ${CHECK_USR} -eq 1 && ${CHECK_USRHASH} -eq 1 && ${CHECK_ROOT} -eq 1 ]]; then
-  read -r "Alle Partitionen sind vorhanden. Trotzdem neu erstellen? (j/N): " confirm
+  read -r -p "Alle Partitionen sind vorhanden. Trotzdem neu erstellen? (j/N): " confirm
   if [[ "${confirm}" == [jJ] ]];then
     echo "Partitionen werden neu erstellt"
     RECREATE_PARTITIONS="1"
@@ -260,7 +260,7 @@ CHECK_FS_ROOT=$(echo "${FILESYSTEM_OUTPUT}" | grep "${ROOT_PARTITION["PARTUUID"]
 RECREATE_FILESYSTEMS="0"
 if [[ ${CHECK_FS_ESP} -eq 1 && ${CHECK_FS_USR} -eq 1 && ${CHECK_FS_USRHASH} -eq 1 && ${CHECK_FS_ROOT} -eq 1 ]]; then
   echo "Alles vorhanden"
-  read -r "Alle Dateisysteme vorhanden. Trotzdem neu erstellen? (j/N): " confirm
+  read -r -p "Alle Dateisysteme vorhanden. Trotzdem neu erstellen? (j/N): " confirm
   if [[ ${confirm} == [jJ] ]]; then
     echo "Dateisysteme werden neuerstellt."
     RECREATE_FILESYSTEMS="1"

From b19d9c5a229926c1b4eac6b4bdeef3aaf606db36 Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sun, 23 Jul 2023 20:37:53 +0200
Subject: [PATCH 2/3] =?UTF-8?q?Beim=20Filesystem-Check-lsblk=20noch=20LABE?=
 =?UTF-8?q?L=20hinzugef=C3=BCgt,=20damit=20der=20Check=20funktioniert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.uefi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.uefi b/install.uefi
index 9c8b545..a1917ff 100644
--- a/install.uefi
+++ b/install.uefi
@@ -251,7 +251,7 @@ for i in ${PARTITION_NUMBERS}; do
 done
 
 # Prüfen,ob die Dateisysteme schon korrekt sind
-FILESYSTEM_OUTPUT=$(lsblk -o NAME,FSTYPE,FSVER,PARTUUID | grep "${DRIVE//\/dev\/}[0-9]")
+FILESYSTEM_OUTPUT=$(lsblk -o NAME,FSTYPE,FSVER,PARTUUIDi,LABEL | grep "${DRIVE//\/dev\/}[0-9]")
 CHECK_FS_ESP=$(echo "${FILESYSTEM_OUTPUT}" | grep "${ESP_PARTITION["PARTUUID"]}" | grep -i "vfat" | grep -i "fat32" | grep -c -i "${ESP_LABEL}")
 CHECK_FS_USR=$(echo "${FILESYSTEM_OUTPUT}" | grep "${USR_PARTITION["PARTUUID"]}" | grep -i "ext4" | grep -c -i "${USR_LABEL}")
 CHECK_FS_USRHASH=$(echo "${FILESYSTEM_OUTPUT}" | grep "${USRHASH_PARTITION["PARTUUID"]}" | grep -c -i "dm_verity_hash")

From f44c9a49857e4ed0676422f33b8972726bace835 Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sun, 23 Jul 2023 20:38:36 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Etwas=20Verz=C3=B6gerung=20eingebaut,=20dam?=
 =?UTF-8?q?it=20man=20Output=20lesen=20kann.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.uefi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install.uefi b/install.uefi
index a1917ff..aaf5600 100644
--- a/install.uefi
+++ b/install.uefi
@@ -115,6 +115,7 @@ if [[ ${CHECK_ESP} -eq 1 && ${CHECK_USR} -eq 1 && ${CHECK_USRHASH} -eq 1 && ${CH
     echo "Partitionen werden nicht neu erstellt"
     RECREATE_PARTITIONS="0"
   fi
+  sleep 5
 fi
 
 if [[ ${RECREATE_PARTITIONS} -eq 1 ]]; then
@@ -268,6 +269,7 @@ if [[ ${CHECK_FS_ESP} -eq 1 && ${CHECK_FS_USR} -eq 1 && ${CHECK_FS_USRHASH} -eq
     echo "Dateisysteme werden nicht neu erstellt."
     RECREATE_FILESYSTEMS="0"
   fi
+  sleep 5
 fi
 
 if [[ (${CHECK_ESP} -eq 0 || ${RECREATE_FILESYSTEMS} -eq 1) && -n ${ESP_PARTITION["PARTUUID"]} ]]; then