From 60f6cc7fd5ae67cdbf50a0f3c3370da0d05270e2 Mon Sep 17 00:00:00 2001
From: nils <nils@byreqz.de>
Date: Wed, 4 Aug 2021 16:20:21 +0200
Subject: [PATCH] tweak formatting

---
 stocheck.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/stocheck.sh b/stocheck.sh
index d0a7564..49edf7b 100755
--- a/stocheck.sh
+++ b/stocheck.sh
@@ -31,7 +31,7 @@ while [ -z "$1" ]; do
       echo -e "--------------------------------------------------"
       for ((x=1;x<=raidlist2;x++)); do
           raid=$(echo "$raidlist" | sed -n "$x"p)
-          if [[ -z $(echo "$lsbl" | grep -e "$raid" | grep -e "%") ]];then
+          if [[ -z $(echo "$lsbl" | grep -e "%") ]];then
               raidts="unmounted"
           fi
           if [[ "$raidts" == "unmounted" ]];then
@@ -39,11 +39,9 @@ while [ -z "$1" ]; do
               raiduuid=$(echo "$lsbl" | grep "$raid" | tr -s ' ' | cut -d " " -f 4)
               raidstate=$(echo "$mdadmconf" | grep -e "$raid" | cut -d " " -f 4)
               raiddrives=$(echo "$mdadmconf" | grep -e "$raid" | cut -c 6- | grep -o -E "sd[a-z][0-9]|nvme[0-9]n[0-9]p[0-9]" | tr "\n" " ")
-              raidts="$(sfdisk -l | grep -e "$raid:" | cut -d " " -f 3) GiB"
-              echo -e "\033[1mArray:\033[0m "$raid" \033[1mType:\033[0m "$raidstate" \033[1mSize:\033[0m "$raidts""
+              echo -e "\033[1mArray:\033[0m "$raid" \033[1mType:\033[0m "$raidstate" \033[1mFS:\033[0m "$raidfs""
               echo -e "\033[1mMembers:\033[0m "$raiddrives""
-              echo -e "\033[1mState:\033[0m "unmounted" \033[1mFilesystem:\033[0m "$raidfs""
-              echo -e "\033[1mP-UUID\033[0m "$raiduuid""
+              echo -e "\033[1mState:\033[0m "$raidts" \033[1mP-UUID\033[0m "$raiduuid""
               echo -e ""
           else
               raidfs=$(echo "$lsbl" | grep "$raid" | tr -s ' ' | cut -d " " -f 3)
@@ -52,8 +50,7 @@ while [ -z "$1" ]; do
               raiduuid=$(echo "$lsbl" | grep "$raid" | tr -s ' ' | cut -d " " -f 4)
               raidstate=$(echo "$mdadmconf" | grep -e "$raid" | cut -d " " -f 4)
               raiddrives=$(echo "$mdadmconf" | grep -e "$raid" | cut -c 6- | grep -o -E "sd[a-z][0-9]|nvme[0-9]n[0-9]p[0-9]" | tr "\n" " ")
-              raidts="$(sfdisk -l | grep -e "$raid:" | cut -d " " -f 3) GiB"
-              echo -e "\033[1mArray:\033[0m "$raid" \033[1mType:\033[0m "$raidstate" \033[1mSize:\033[0m "$raidts"/"$raidper""
+              echo -e "\033[1mArray:\033[0m "$raid" \033[1mType:\033[0m "$raidstate" \033[1mSize:\033[0m "$raidts" \033[1m%:\033[0m "$raidper""
               echo -e "\033[1mMembers:\033[0m "$raiddrives""
               echo -e "\033[1mState:\033[0m "mounted" \033[1mFilesystem:\033[0m "$raidfs" \033[1mMountpoint:\033[0m "$raidmp""
               echo -e "\033[1mP-UUID\033[0m "$raiduuid""