From c05f34eb7d5a829db0f94e780a9c78658b37340d Mon Sep 17 00:00:00 2001
From: CapCreeperGR <nickvavour@gmail.com>
Date: Thu, 16 May 2024 22:24:16 +0300
Subject: [PATCH] Fixed minor bug and updated fetch_script.sh Fixed bug which
 would cause partitions not to show up if /dev/disk/by-partlabel/ did not
 exist Updated fetch_script.sh to use labels if available

---
 config/fetch_script.sh | 9 +++++++--
 utils.go               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/fetch_script.sh b/config/fetch_script.sh
index 3a7807a..a289b1b 100644
--- a/config/fetch_script.sh
+++ b/config/fetch_script.sh
@@ -11,9 +11,14 @@ if [ ! -z "$MEM_TOTAL" ] && [ ! -z "$MEM_USED" ]; then echo -e "${C3}Memory: ${C
 for i in $(seq ${MOUNTED_PARTITIONS}); do
     device="PARTITION${i}_DEVICE"
     mountpoint="PARTITION${i}_MOUNTPOINT"
+    label="PARTITION${i}_LABEL"
     total="PARTITION${i}_TOTAL_SIZE"
     used="PARTITION${i}_USED_SIZE"
-    echo -e "${C3}${!mountpoint}: ${C4}${!used}/${!total}"
+    if [ -z "${!label}" ]; then
+      echo -e "${C3}Partition ${!mountpoint}: ${C4}${!used}/${!total}"
+    else
+      echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
+    fi
   done
 if [ ! -z "$DISPLAY_PROTOCOL" ]; then
   echo -e "${C3}Display Protocol: ${C4}${DISPLAY_PROTOCOL}"
@@ -22,4 +27,4 @@ if [ ! -z "$DISPLAY_PROTOCOL" ]; then
     echo -e "${C3}Screen $i: ${C4}${!monitor}"
   done
 fi
-if [ ! -z "$DE_WM" ]; then echo -e "${C3}DE/WM: ${C4}${DE_WM}"; fi
\ No newline at end of file
+if [ ! -z "$DE_WM" ]; then echo -e "${C3}DE/WM: ${C4}${DE_WM}"; fi
diff --git a/utils.go b/utils.go
index 7ccff00..2866c75 100644
--- a/utils.go
+++ b/utils.go
@@ -336,7 +336,7 @@ func getMountedPartitions() []partition {
 	}
 
 	partlabels, err := os.ReadDir("/dev/disk/by-partlabel")
-	if err != nil {
+	if err != nil && !os.IsNotExist(err) {
 		return nil
 	}
 	labels := make(map[string]string)