From f8779be33349cdedc5f931e9f5c4f6e98c75e833 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 1 Jun 2018 09:29:51 +1000
Subject: [PATCH] disk: cleanup

---
 neofetch | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/neofetch b/neofetch
index 9e368093..4fda7dbc 100755
--- a/neofetch
+++ b/neofetch
@@ -3053,15 +3053,17 @@ get_disk() {
     type -p df >/dev/null 2>&1 ||\
         { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; }
 
-    # Get "df" version.
     df_version="$(df --version 2>&1)"
+
     case "$df_version" in
+        *"IMitv"*)   df_flags=(-P -g) ;; # AIX
+        *"befhikm"*) df_flags=(-P -k) ;; # IRIX
+
         *"Tracker"*) # Haiku
             err "Your version of df cannot be used due to the non-standard flags"
             return
         ;;
-        *"IMitv"*) df_flags=(-P -g) ;; # AIX
-        *"befhikm"*) df_flags=(-P -k) ;; # IRIX
+
         *) df_flags=(-P -h) ;;
     esac
 
@@ -3071,10 +3073,10 @@ get_disk() {
     unset "disks[0]"
 
     # Stop here if 'df' fails to print disk info.
-    if [[ -z "${disks[*]}" ]]; then
+    [[ -z "${disks[*]}" ]] && {
         err "Disk: df failed to print the disks, make sure the disk_show array is set properly."
         return
-    fi
+    }
 
     for disk in "${disks[@]}"; do
         # Create a second array and make each element split at whitespace this time.
@@ -3085,17 +3087,26 @@ get_disk() {
             *"befhikm"*)
                 disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)"
             ;;
-            *) disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" ;;
+
+            *)
+                disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)"
+            ;;
         esac
 
         # Subtitle.
         case "$disk_subtitle" in
-            "name") disk_sub="${disk_info[0]}" ;;
+            "name")
+                disk_sub="${disk_info[0]}"
+            ;;
+
             "dir")
                 disk_sub="${disk_info[5]/*\/}"
-                [[ -z "$disk_sub" ]] && disk_sub="${disk_info[5]}"
+                disk_sub="${disk_sub:-${disk_info[5]}}"
+            ;;
+
+            *)
+                disk_sub="${disk_info[5]}"
             ;;
-            *) disk_sub="${disk_info[5]}" ;;
         esac
 
         # Bar.