kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #383 from konimex/uptime-fix

Browse source 
Solaris: Rewritten uptime
This commit is contained in:
Dylan Araps 2016-10-21 20:31:23 +11:00 committed by GitHub
commit 86cfc366c2
1 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
neofetch
View file

@ -268,8 +268,6 @@ getkernel() {
# Uptime {{{ # Uptime {{{
getuptime() { getuptime() {
case "$os" in
"Linux" | "Windows" | "Mac OS X" | "iPhone OS" | "BSD")
# Get uptime in seconds # Get uptime in seconds
case "$os" in case "$os" in
"Linux" | "Windows") "Linux" | "Windows")
@ -286,6 +284,11 @@ getuptime() {
now="$(date +%s)" now="$(date +%s)"
seconds="$((now - boot))" seconds="$((now - boot))"
;; ;;
"Solaris")
seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')"
seconds="${seconds/.*}"
;;
esac esac
days="$((seconds / 60 / 60 / 24)) days" days="$((seconds / 60 / 60 / 24)) days"
@ -310,12 +313,6 @@ getuptime() {
uptime="${days:+$days, }${hours:+$hours, }${minutes}" uptime="${days:+$days, }${hours:+$hours, }${minutes}"
uptime="${uptime%', '}" uptime="${uptime%', '}"
uptime="up ${uptime:-${seconds} seconds}" uptime="up ${uptime:-${seconds} seconds}"
;;
"Solaris")
uptime="$(uptime | /usr/xpg4/bin/awk -F ':[0-9]{2}+[a-z][a-z] |(, ){1}+' '{printf $2}')"
;;
esac
# Make the output of uptime smaller. # Make the output of uptime smaller.
case "$uptime_shorthand" in case "$uptime_shorthand" in