From 9d29708b6411aa3cdd1736de3bce7645610dcf85 Mon Sep 17 00:00:00 2001 From: Jared Vititoe Date: Sat, 1 Mar 2025 12:39:53 -0500 Subject: [PATCH] just drive letters --- driveAtlas.sh | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/driveAtlas.sh b/driveAtlas.sh index 7d08ad6..2242f1d 100644 --- a/driveAtlas.sh +++ b/driveAtlas.sh @@ -106,26 +106,17 @@ medium1=''' ''' generate_medium2_layout() { - # Get USB drives + # USB Section + printf " External USB [0b:00.0]\n" + printf " ┌────────┐ ┌────────┐\n" usb_drives=$(ls -l /dev/disk/by-path/pci-0000:0b:00.0-usb* 2>/dev/null | awk -F'/' '{print $NF}') if [ -n "$usb_drives" ]; then - for drive in $usb_drives; do - local size=$(get_drive_details "$drive") - local smart_info=$(get_drive_smart_info "$drive") - printf " │ %-6s │ │ %-6s │\n" "$drive" "$size" + for usb_drive in $(echo "$usb_drives"); do + printf " │ %-6s │ │ │\n" "$usb_drive" done else printf " │ EMPTY │ │ EMPTY │\n" fi - - - # USB Section - printf " External USB [0b:00.0]\n" - printf " ┌────────┐ ┌────────┐\n" - for usb_drive in $(echo "$usb_drives" | awk -F'/' '{print $NF}'); do - local size=$(get_drive_details "$usb_drive") - printf " │ %-6s │ │ %-6s │\n" "$usb_drive" "$size" - done printf " └────────┘ └────────┘\n\n" # Main chassis @@ -134,8 +125,7 @@ generate_medium2_layout() { printf "│ │\n" printf "│ NVMe [0d:00.0] │\n" printf "│ ┌────────┐ │\n" - printf "│ │ %-6s │ │\n" "nvme0n1" - printf "│ │ PCIe │ │\n" + printf "│ │ nvme0n1 │ │\n" printf "│ └────────┘ │\n" printf "│ │\n" printf "│ Front Hot-swap Bays [0c:00.0] │\n" @@ -143,13 +133,10 @@ generate_medium2_layout() { # Map drives to bays dynamically for bay in {1..10}; do - # Get drive info from physical path mapping local drive_path=$(ls -l /dev/disk/by-path/pci-0000:0c:00.0-ata-$bay 2>/dev/null) if [ -n "$drive_path" ]; then local drive=$(echo "$drive_path" | awk -F'/' '{print $NF}') - local size=$(get_drive_details "$drive") - local smart_info=$(get_drive_smart_info "$drive") - printf "│ %-8s │ %-8s │ %-8s │" "$drive" "$size" "${smart_info%%|*}" + printf "│ │ %-6s │" "$drive" else printf "│ │ EMPTY │" fi @@ -160,6 +147,7 @@ generate_medium2_layout() { printf "└──────────────────────────────────────────────────────────────┘\n" } + microGeneric=''' ┌─┐ ┌─┐ ┌└─┘──└─┘┐