From 25500dfbc5c27a5e619906864a53f44abbb5d975 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Mon, 24 Jun 2024 21:14:42 +0200 Subject: [PATCH] tree: fix typos Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 11 ++++++----- files/initrd/opt/arc/arc.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 525e3761..cf3219cd 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1586,19 +1586,20 @@ function saveMenu() { # let user format disks from inside arc function formatDisks() { rm -f "${TMP_PATH}/opts" - while read -r KNAME ID PKNAME; do + while read -r KNAME SIZE PKNAME; do [ -z "${KNAME}" ] && continue [[ "${KNAME}" = /dev/md* ]] && continue [[ "${KNAME}" = "${LOADER_DISK}" || "${PKNAME}" = "${LOADER_DISK}" ]] && continue - [ -z "${ID}" ] && ID="Unknown" - echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts" - done < <(lsblk -pno KNAME,ID,PKNAME) + [ -n "${PKNAME}" ] && PARTITION=" (Partition)" || PARTITION=" (Disk)" + [ -z "${SIZE}" ] && SIZE="Unknown" + echo "\"${KNAME}\" \"${SIZE}${PARTITION}\" \"off\"" >>"${TMP_PATH}/opts" + done < <(lsblk -pno KNAME,SIZE,PKNAME) if [ ! -f "${TMP_PATH}/opts" ]; then dialog --backtitle "$(backtitle)" --title "Format Disks" \ --msgbox "No disk found!" 0 0 return fi - DIALOG --title "Format Disks" \ + dialog --backtitle "$(backtitle)" --title "Format Disks" \ --checklist "Select Disks" 0 0 0 --file "${TMP_PATH}/opts" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 4663ea07..d4c3ee78 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -1208,7 +1208,7 @@ else L) greplogs; NEXT="L" ;; T) forcessh; NEXT="T" ;; C) cloneLoader; NEXT="C" ;; - F) formatdisks; NEXT="F" ;; + F) formatDisks; NEXT="F" ;; G) package; NEXT="G" ;; # Misc Settings x) backupMenu; NEXT="x" ;;