feat(disk): enhance selection with model, serial, and vendor info using JSON

1 file · +11 -2

M install/partitioning/detect-disk.sh +11 -2


@@ -4,8 +4,17 @@
4	4		gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Disk Selection"
5	5		echo
6	6
7		-	# List available disks
8		-	mapfile -t disks < <(lsblk -dno NAME,SIZE,TYPE \| grep disk \| awk '{print "/dev/" $1 " (" $2 ")"}')
	7	+	# List available disks with detailed information using JSON output
	8	+	mapfile -t disks < <(lsblk -J -d -o NAME,SIZE,TYPE,MODEL,SERIAL,VENDOR \| jq -r '
	9	+	.blockdevices[] \|
	10	+	select(.type == "disk") \|
	11	+	(
	12	+	"/dev/\(.name) (\(.size))" +
	13	+	(if .model then " \(.model)" else "" end) +
	14	+	(if .serial then " [\(.serial)]" else "" end) +
	15	+	(if .vendor then " \(.vendor)" else "" end)
	16	+	)
	17	+	')
9	18
10	19		if [ ${#disks[@]} -eq 0 ]; then
11	20		gum style --foreground 1 --padding "0 0 0 $PADDING_LEFT" "No disks found!"


@@ -4,8 +4,17 @@
4		gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Disk Selection"	4		gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Disk Selection"
5		echo	5		echo
6			6
7	-	# List available disks	7	+	# List available disks with detailed information using JSON output
8	-	mapfile -t disks < <(lsblk -dno NAME,SIZE,TYPE \| grep disk \| awk '{print "/dev/" $1 " (" $2 ")"}')	8	+	mapfile -t disks < <(lsblk -J -d -o NAME,SIZE,TYPE,MODEL,SERIAL,VENDOR \| jq -r '
			9	+	.blockdevices[] \|
			10	+	select(.type == "disk") \|
			11	+	(
			12	+	"/dev/\(.name) (\(.size))" +
			13	+	(if .model then " \(.model)" else "" end) +
			14	+	(if .serial then " [\(.serial)]" else "" end) +
			15	+	(if .vendor then " \(.vendor)" else "" end)
			16	+	)
			17	+	')
9			18
10		if [ ${#disks[@]} -eq 0 ]; then	19		if [ ${#disks[@]} -eq 0 ]; then
11		gum style --foreground 1 --padding "0 0 0 $PADDING_LEFT" "No disks found!"	20		gum style --foreground 1 --padding "0 0 0 $PADDING_LEFT" "No disks found!"