diff --git a/debian/changelog b/debian/changelog index eb797d6a..c323d006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ byobu (5.108) unreleased; urgency=medium + [ Dustin Kirkland ] * usr/lib/byobu/updates_available: - remove trailing whitespace * usr/lib/byobu/battery: @@ -7,6 +8,10 @@ byobu (5.108) unreleased; urgency=medium POWER_SUPPLY_CHARGE_NOW are available; important for summing multiple batteries + [ Kevin Mark and Dustin Kirkland ] + * usr/lib/byobu/uptime: + - fix uptime status on MacOS + -- Dustin Kirkland Mon, 09 May 2016 18:26:22 -0500 byobu (5.107-0ubuntu1) yakkety; urgency=medium diff --git a/usr/lib/byobu/uptime b/usr/lib/byobu/uptime index 63290dd3..219e5644 100755 --- a/usr/lib/byobu/uptime +++ b/usr/lib/byobu/uptime @@ -30,6 +30,12 @@ __uptime() { if [ -r /proc/uptime ]; then read u idle < /proc/uptime u=${u%.*} + elif [ -x /usr/sbin/sysctl ]; then + # MacOS support + u=$(/usr/sbin/sysctl -n kern.boottime | cut -f4 -d' ' | cut -d',' -f1) + u=$(($(date +%s) - $u)) + fi + if [ "$u" ]; then if [ "$u" -gt 86400 ]; then str="$(($u / 86400))d$((($u % 86400) / 3600))h" elif [ "$u" -gt 3600 ]; then @@ -40,6 +46,7 @@ __uptime() { str="${u}s" fi else + # Last ditch hack str=$(uptime | sed -e "s/.* up *//" -e "s/ *days, */d/" -e "s/:/h/" -e "s/,.*/m/") fi [ -n "$str" ] || return