From 54c5955f32aed1b727016adb0e14edb88a22f9c2 Mon Sep 17 00:00:00 2001
From: Jared Vititoe <jjvititoe1@gmail.com>
Date: Sat, 1 Mar 2025 13:31:59 -0500
Subject: [PATCH] changed physical mapping

---
 driveAtlas.sh | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/driveAtlas.sh b/driveAtlas.sh
index 26f932a..036ae61 100644
--- a/driveAtlas.sh
+++ b/driveAtlas.sh
@@ -36,26 +36,20 @@ get_physical_mapping() {
     local -A drive_map
     
     # Map NVMe drives
-    local nvme_info=$(ls -l /dev/disk/by-path/pci-0000:0d:00.0* 2>/dev/null)
-    for nvme in $(echo "$nvme_info" | awk -F'/' '{print $NF}'); do
-        drive_map[11]=$(get_drive_smart_info "$nvme")
-    done
-    
-    # Map SATA hot-swap bays
-    local hotswap_info=$(ls -l /dev/disk/by-path/pci-0000:0c:00.0-ata-* 2>/dev/null)
-    for drive in $(echo "$hotswap_info" | awk -F'/' '{print $NF}'); do
-        local bay=$(echo "$drive" | grep -o 'ata-[0-9]' | cut -d- -f2)
-        if [[ -n "$bay" ]]; then
-            drive_map[$bay]=$(get_drive_smart_info "$drive")
+    for nvme in /dev/nvme*n1; do
+        if [ -b "$nvme" ]; then
+            drive_map[11]=$(basename "$nvme")
         fi
     done
     
-    # Map USB devices
-    local usb_info=$(ls -l /dev/disk/by-path/pci-0000:0b:00.0-usb* 2>/dev/null | awk -F'/' '{print $NF}')
-    local usb_count=1
-    for usb in $(echo "$usb_info"); do
-        drive_map["usb$usb_count"]=$(get_drive_smart_info "$usb")
-        ((usb_count++))
+    # Map SATA drives
+    for drive in /dev/sd[a-z]; do
+        if [ -b "$drive" ]; then
+            local bay=$(get_bay_number "$drive")
+            if [[ -n "$bay" ]]; then
+                drive_map[$bay]=$(basename "$drive")
+            fi
+        fi
     done
     
     echo "$(declare -p drive_map)"