From b05d8b006e22f1e2351e0768b3e74ac710b5b6df Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 28 Dec 2010 00:04:06 -0600 Subject: [PATCH] usr/lib/byobu/network: ensure that up/down and units are always set --- debian/changelog | 2 +- usr/lib/byobu/network | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa5f400b..d1ca8f61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ byobu (3.19) unreleased; urgency=low - * UNRELEASED + * usr/lib/byobu/network: ensure that up/down and units are always set -- Dustin Kirkland Mon, 27 Dec 2010 23:44:05 -0600 diff --git a/usr/lib/byobu/network b/usr/lib/byobu/network index 6efed006..bf5c5195 100755 --- a/usr/lib/byobu/network +++ b/usr/lib/byobu/network @@ -36,6 +36,11 @@ fi [ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA" t2=`date +%s` for i in up down; do + unit="kbps" + case $i in + up) symbol="^" ;; + down) symbol="v" ;; + esac cache="$DIR/$PKG.network_$i" t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0 if [ $t2 -le $t1 ]; then @@ -43,10 +48,8 @@ for i in up down; do else x1=`cat "$cache"` 2>/dev/null || tx1=0 if [ "$i" = "up" ]; then - symbol="^" x2=`grep -m1 "\b$interface:" /proc/net/dev | sed "s/^.*://" | awk '{print $9}'` else - symbol="v" x2=`grep -m1 "\b$interface:" /proc/net/dev | sed "s/^.*://" | awk '{print $1}'` fi echo "$x2" > "$cache"