Revert back to more reliable function

This commit is contained in:
Dylan 2016-04-29 10:27:43 +10:00
parent d47c126144
commit 7eaf3f3b4d
1 changed files with 15 additions and 7 deletions

View File

@ -591,24 +591,32 @@ getuptime () {
days=$((uptime / 86400)) days=$((uptime / 86400))
case "$minutes" in case "$minutes" in
1) uptime="1 minute" ;; 1) minutes="1 minute" ;;
0) unset minutes ;; 0) unset minutes ;;
*) uptime="$minutes minutes" ;; *) minutes="$minutes minutes" ;;
esac esac
case "$hours" in case "$hours" in
1) uptime="1 hour, $uptime" ;; 1) hours="1 hour" ;;
0) unset hours ;; 0) unset hours ;;
*) uptime="$hours hours, $uptime" ;; *) hours="$hours hours" ;;
esac esac
case "$days" in case "$days" in
1) uptime="1 day, $uptime" ;; 1) days="1 day" ;;
0) unset days ;; 0) unset days ;;
*) uptime="$days days, $uptime" ;; *) days="$days days" ;;
esac esac
uptime="up $uptime" [ ! -z "$hours" ] && \
[ ! -z "$minutes" ] && \
hours+=","
[ ! -z "$days" ] && \
[ ! -z "$hours" ] && \
days+=","
uptime="up $days $hours $minutes"
;; ;;
esac esac