From 988bf35d3424908d6a7505bd46044718ea96036c Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 7 Apr 2009 00:31:45 -0700 Subject: [PATCH] fix network-* when 0 byte rate --- bin/network-down | 22 ++++++++++------------ bin/network-up | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/bin/network-down b/bin/network-down index 970cce7e..6b470c65 100755 --- a/bin/network-down +++ b/bin/network-down @@ -29,17 +29,15 @@ t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0 t2=`date +%s` if [ $t2 -le $t1 ]; then - printf "v0 $unit" - exit 0 -fi - -x1=`cat "$cache"` 2>/dev/null || tx1=0 -x2=`ifconfig "$interface" | grep "RX bytes" | sed "s/^.*RX bytes://" | sed "s/ .*$//"` - -echo "$x2" > "$cache" -rate=`echo "$t1" "$t2" "$x1" "$x2" | awk '{printf "%.0f", ($4 - $3) / ($2 - $1) / 1024 }'` -if [ "$rate" -gt 1024 ]; then - rate=`echo "$rate" | awk '{printf "%.1f", $1/1024}'` - unit="MB/s" + rate=0 +else + x1=`cat "$cache"` 2>/dev/null || tx1=0 + x2=`ifconfig "$interface" | grep "RX bytes" | sed "s/^.*RX bytes://" | sed "s/ .*$//"` + echo "$x2" > "$cache" + rate=`echo "$t1" "$t2" "$x1" "$x2" | awk '{printf "%.0f", ($4 - $3) / ($2 - $1) / 1024 }'` + if [ "$rate" -gt 1024 ]; then + rate=`echo "$rate" | awk '{printf "%.1f", $1/1024}'` + unit="MB/s" + fi fi printf "v\005{=b mw}$rate\005{-}\005{= mw}$unit\005{-} " diff --git a/bin/network-up b/bin/network-up index b3bddc54..b79a51f6 100755 --- a/bin/network-up +++ b/bin/network-up @@ -30,17 +30,15 @@ t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0 t2=`date +%s` if [ $t2 -le $t1 ]; then - printf "v0 $unit" - exit 0 -fi - -x1=`cat "$cache"` 2>/dev/null || tx1=0 -x2=`ifconfig "$interface" | grep "TX bytes" | sed "s/^.*TX bytes://" | sed "s/ .*$//"` - -echo "$x2" > "$cache" -rate=`echo "$t1" "$t2" "$x1" "$x2" | awk '{printf "%.0f", ($4 - $3) / ($2 - $1) / 1024 }'` -if [ "$rate" -gt 1024 ]; then - rate=`echo "$rate" | awk '{printf "%.1f", $1/1024}'` - unit="MB/s" + rate=0 +else + x1=`cat "$cache"` 2>/dev/null || tx1=0 + x2=`ifconfig "$interface" | grep "TX bytes" | sed "s/^.*TX bytes://" | sed "s/ .*$//"` + echo "$x2" > "$cache" + rate=`echo "$t1" "$t2" "$x1" "$x2" | awk '{printf "%.0f", ($4 - $3) / ($2 - $1) / 1024 }'` + if [ "$rate" -gt 1024 ]; then + rate=`echo "$rate" | awk '{printf "%.1f", $1/1024}'` + unit="MB/s" + fi fi printf "^\005{=b mw}$rate\005{-}\005{= mw}$unit\005{-} "