From 2404a5e0adfe5a39cac70d01eb9db27c45c98161 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Jan 2017 21:39:50 +1100 Subject: [PATCH] Disk: Revert previous commits --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 09106151..9de18241 100755 --- a/neofetch +++ b/neofetch @@ -1614,11 +1614,17 @@ get_term_font() { get_disk() { type -p df >/dev/null 2>&1 || { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; } - [[ "$os" == "Haiku" ]] && { err "Disk doesn't work on Haiku due to the non-standard 'df'"; return; } + + # Get "df" flags. + case "$os" in + "Haiku") err "Disk doesn't work on Haiku due to the non-standard 'df'"; return ;; + "Mac OS X") df_flags=(-P -h) ;; + *) df_flags=(-h) ;; + esac # Create an array called 'disks' where each element is a separate line from # df's output. We then unset the first element which removes the column titles. - readarray disks < <(df -h "${disk_show[@]:-/}") && unset 'disks[0]' + readarray disks < <(df "${df_flags[@]}" "${disk_show[@]:-/}") && unset 'disks[0]' # Stop here if 'df' fails to print disk info. [[ -z "${disks[@]}" ]] && \ @@ -1642,11 +1648,6 @@ get_disk() { # Append '(disk mount point)' to the subtitle. prin "${subtitle} (${disk_info[5]})" "$disk" done - - # Temporary test for mac OS. - df -h "${disk_show[@]:-/}" - df -h / - exit } get_battery() {