EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #231 from dylanaraps/uptime_fixes 

OSX and BSD uptime fixes.
This commit is contained in:
Dylan Araps 2016-04-29 11:10:05 +10:00
parent 2f96e8b3ec 1c9f19fd21
commit 854f9e505e
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
neofetch
View File

@ -586,37 +586,44 @@ getuptime () {
uptime=$((now - boot)) uptime=$((now - boot))
# Convert uptime to days/hours/mins # Convert uptime to days/hours/mins
mins=$((uptime / 60%60)) minutes=$((uptime / 60%60))
hours=$((uptime / 3600%24)) hours=$((uptime / 3600%24))
days=$((uptime / 86400)) days=$((uptime / 86400))
# Format the output like Linux's "uptime -p" cmd. case "$minutes" in
if [ "$mins" == 1 ]; then 1) minutes="1 minute" ;;
uptime="$mins minute" 0) unset minutes ;;
elif [ "$mins" != 0 ]; then *) minutes="$minutes minutes" ;;
uptime="$mins minutes" esac
fi
if [ "$hours" == 1 ]; then case "$hours" in
uptime="$hours hour, $uptime" 1) hours="1 hour" ;;
elif [ "$mins" != 0 ]; then 0) unset hours ;;
uptime="$hours hours, $uptime" *) hours="$hours hours" ;;
fi esac
if [ "$days" == 1 ]; then case "$days" in
uptime="$days day, $uptime" 1) days="1 day" ;;
elif [ "$days" != 0 ]; then 0) unset days ;;
uptime="$days days, $uptime" *) days="$days days" ;;
fi esac
uptime="up $uptime" [ ! -z "$hours" ] && \
[ ! -z "$minutes" ] && \
hours+=","
[ ! -z "$days" ] && \
[ ! -z "$hours" ] && \
days+=","
uptime="up $days $hours $minutes"
;; ;;
esac esac
# Make the output of uptime smaller. # Make the output of uptime smaller.
case "$uptime_shorthand" in case "$uptime_shorthand" in
"on") "on")
uptime=${uptime/up} uptime=${uptime/up }
uptime=${uptime/minutes/mins} uptime=${uptime/minutes/mins}
uptime=${uptime/minute/min} uptime=${uptime/minute/min}
uptime=${uptime/seconds/secs} uptime=${uptime/seconds/secs}
@ -624,7 +631,7 @@ getuptime () {
;; ;;
"tiny") "tiny")
uptime=${uptime/up} uptime=${uptime/up }
uptime=${uptime/ days/d} uptime=${uptime/ days/d}
uptime=${uptime/ day/d} uptime=${uptime/ day/d}
uptime=${uptime/ hours/h} uptime=${uptime/ hours/h}