From 893ed2347d97af574becf69dee1166a1bf933081 Mon Sep 17 00:00:00 2001
From: Markus Hoffrogge <mhoffrogge@gmail.com>
Date: Mon, 19 Dec 2022 07:34:23 +0100
Subject: [PATCH] Fix for selecting non formatted target partitions (#4577)

- function check_partitions():
  - remove file system filter on lsblk commands
    for listing probable target partitions
  - fix typo "Destnation" -> "Destination"
  - fix indentation on if scopes

fixes #4576
---
 packages/bsp/common/usr/sbin/armbian-install | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/bsp/common/usr/sbin/armbian-install b/packages/bsp/common/usr/sbin/armbian-install
index 62f5d4edbd..6f1081dc48 100755
--- a/packages/bsp/common/usr/sbin/armbian-install
+++ b/packages/bsp/common/usr/sbin/armbian-install
@@ -632,25 +632,25 @@ check_partitions()
 	IFS=" "
 	[[ -n "$1" ]] && EXCLUDE=" | grep -v $1"
 	[[ -n "$2" ]] && INCLUDE=" | grep $2" && diskcheck=$2
-	CMD="lsblk -io KNAME,FSTYPE,SIZE,TYPE,MOUNTPOINT | grep \"btrfs\|ext4\|f2fs\" $INCLUDE $EXCLUDE | grep -E '^sd|^nvme|^md|^mmc' | awk -F\" \" '/ part | raid..? / {print \$1}'"
+	CMD="lsblk -io KNAME,FSTYPE,SIZE,TYPE,MOUNTPOINT $INCLUDE $EXCLUDE | grep -E '^sd|^nvme|^md|^mmc' | awk -F\" \" '/ part | raid..? / {print \$1}'"
 	AvailablePartitions=$(eval $CMD)
 	if [[ -z $AvailablePartitions ]]; then
 		FREE_SPACE=$(parted /dev/$diskcheck unit GB print free | awk '/Free Space/{c++; sum += $3; print sum}' | tail -1)
-		dialog --yes-label "Proceed" --no-label 'Exit' --title "$title" --backtitle "$backtitle" --yesno "\nDestnation $diskcheck has $FREE_SPACE Gb of available space. \n\nAutomated install will generate needed partitions!" 9 55
+		dialog --yes-label "Proceed" --no-label 'Exit' --title "$title" --backtitle "$backtitle" --yesno "\nDestination $diskcheck has $FREE_SPACE Gb of available space. \n\nAutomated install will generate needed partitions!" 9 55
 		if [[ "${FREE_SPACE%.*}" -gt 4 && $? == 0 ]]; then
 			if [[ "$DEVICE_TYPE" == uefi && -z "$efi_partition" ]]; then
-			wipefs -aq /dev/$diskcheck
-			# create EFI parition
-	                {
-				echo n; echo ; echo ; echo ; echo +200M;
-				echo t; echo EF; echo w;
-			} | fdisk /dev/$diskcheck &> /dev/null || true
-			yes | mkfs.vfat /dev/${diskcheck}p1 &> /dev/null || true
-			fatlabel /dev/${diskcheck}p1 EFI
+				wipefs -aq /dev/$diskcheck
+				# create EFI partition
+				{
+					echo n; echo ; echo ; echo ; echo +200M;
+					echo t; echo EF; echo w;
+				} | fdisk /dev/$diskcheck &> /dev/null || true
+				yes | mkfs.vfat /dev/${diskcheck}p1 &> /dev/null || true
+				fatlabel /dev/${diskcheck}p1 EFI
 			fi
 			{
-			echo n; echo ; echo ; echo ; echo
-			echo w
+				echo n; echo ; echo ; echo ; echo
+				echo w
 			} | fdisk /dev/$diskcheck &> /dev/null || true
 			yes | mkfs.ext4 /dev/${diskcheck}p2 &> /dev/null || true
 
@@ -658,11 +658,11 @@ check_partitions()
 			emmccheck=$(ls -d -1 /dev/mmcblk* 2>/dev/null | grep -w 'mmcblk[0-9]' | grep -v "$root_partition_device");
 			efi_partition=$(LC_ALL=C fdisk -l "/dev/$diskcheck" 2>/dev/null | grep "EFI" | awk '{print $1}')
 
-			else
-				exit 11
-			fi
+		else
+			exit 11
+		fi
 	fi
-	CMD="lsblk -io KNAME,FSTYPE,SIZE,TYPE,MOUNTPOINT | grep \"btrfs\|ext4\|f2fs\" $INCLUDE $EXCLUDE | grep -E '^sd|^nvme|^md|^mmc' | awk -F\" \" '/ part | raid..? / {print \$1}' | uniq | sed 's|^|/dev/|' | nl | xargs echo -n"
+	CMD="lsblk -io KNAME,FSTYPE,SIZE,TYPE,MOUNTPOINT $INCLUDE $EXCLUDE | grep -E '^sd|^nvme|^md|^mmc' | awk -F\" \" '/ part | raid..? / {print \$1}' | uniq | sed 's|^|/dev/|' | nl | xargs echo -n"
 	partprobe
 	AvailablePartitions=$(eval $CMD)
 	PartitionOptions=($AvailablePartitions)