From b0e9cc47821be58ed95256b84a86f67b65777142 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Mon, 4 Jan 2016 15:50:52 +1100 Subject: [PATCH] Fixed whitespace issue and name issue with OS X uptime --- Readme.md | 9 +++++++++ fetch.sh | 20 +++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index e44b1fde..ae8b85e1 100644 --- a/Readme.md +++ b/Readme.md @@ -162,3 +162,12 @@ Here's what's on my todo list #### Fill ![fill](https://imgur.com/LvxYwki.png) + + +### Thanks + +Thanks to: + +- Screenfetch: I've used some snippets as a base for a few functions in this script + +- @jrgz: Helping me test the Mac OS X version. diff --git a/fetch.sh b/fetch.sh index 2a53fc9f..71078056 100755 --- a/fetch.sh +++ b/fetch.sh @@ -267,13 +267,23 @@ getuptime () { hours=$((${uptime}/3600%24)) days=$((${uptime}/86400)) - uptime="up ${mins} minutes" + case "$mins" in + 0) ;; + 1) uptime="up ${mins} minute" ;; + *) uptime="up ${mins} minutes" ;; + esac - [ "${hours}" -ne 0 ] && \ - uptime="up ${hours} hours, ${uptime/up/}" + case "$hours" in + 0) ;; + 1) uptime="up ${hours} hour, ${uptime/up /}" ;; + *) uptime="up ${hours} hours, ${uptime/up /}" ;; + esac - [ "${days}" -ne 0 ] && \ - uptime="up ${days} days, ${uptime/up/}" + case "$days" in + 0) ;; + 1) uptime="up ${days} day, ${uptime/up /}" ;; + *) uptime="up ${days} days, ${uptime/up /}" ;; + esac ;; "OpenBSD")