From 7eaf3f3b4dfc759f06502904dbaa1ab44a561902 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 29 Apr 2016 10:27:43 +1000 Subject: [PATCH] Revert back to more reliable function --- neofetch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index fe30d400..e2403dd8 100755 --- a/neofetch +++ b/neofetch @@ -591,24 +591,32 @@ getuptime () { days=$((uptime / 86400)) case "$minutes" in - 1) uptime="1 minute" ;; + 1) minutes="1 minute" ;; 0) unset minutes ;; - *) uptime="$minutes minutes" ;; + *) minutes="$minutes minutes" ;; esac case "$hours" in - 1) uptime="1 hour, $uptime" ;; + 1) hours="1 hour" ;; 0) unset hours ;; - *) uptime="$hours hours, $uptime" ;; + *) hours="$hours hours" ;; esac case "$days" in - 1) uptime="1 day, $uptime" ;; + 1) days="1 day" ;; 0) unset days ;; - *) uptime="$days days, $uptime" ;; + *) days="$days days" ;; esac - uptime="up $uptime" + [ ! -z "$hours" ] && \ + [ ! -z "$minutes" ] && \ + hours+="," + + [ ! -z "$days" ] && \ + [ ! -z "$hours" ] && \ + days+="," + + uptime="up $days $hours $minutes" ;; esac