From 78b266a78c294a0582f1e05dc6f088c9a0ae0262 Mon Sep 17 00:00:00 2001 From: Andrew Lorimer Date: Thu, 11 Oct 2018 16:16:28 +1100 Subject: [PATCH] i3blocks-bandwidth: better support for varying magnitudes a.k.a. bash arithmetic sucks --- i3blocks-bandwidth.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/i3blocks-bandwidth.sh b/i3blocks-bandwidth.sh index 26e5ac7..cab00a9 100755 --- a/i3blocks-bandwidth.sh +++ b/i3blocks-bandwidth.sh @@ -19,7 +19,7 @@ # Get custom IN and OUT labels if provided by command line arguments while [[ $# -gt 1 ]]; do key="$1" - case "$key" in + case "$key" in -i|--inlabel) INLABEL="$2" shift;; @@ -90,7 +90,16 @@ tx_rate=$(( $tx_diff / $time_diff )) echo -n "$INLABEL" rx_kib=$(( $rx_rate >> 10 )) if hash bc 2>/dev/null && [[ "$rx_rate" -gt 1048576 ]]; then - printf '%sM' "`echo "scale=1; $rx_kib / 1024" | bc`" + + if [ $rx_kib -lt 9900 ]; then + printf '%sM' "`echo "scale=1; $rx_kib / 1024" | bc`" + else + if [ $rx_kib -lt 1022976 ]; then + printf '%03dM' "`echo "scale=0; $rx_kib / 1024" | bc`" + else + printf "%sG" "`echo "scale=1; $rx_kib / 1024000" | bc`" + fi + fi else printf %03d ${rx_kib} # leading zeroes so length is constant echo -n "K" @@ -102,7 +111,15 @@ echo -n " " echo -n "$OUTLABEL" tx_kib=$(( $tx_rate >> 10 )) if hash bc 2>/dev/null && [[ "$tx_rate" -gt 1048576 ]]; then - printf '%sM' "`echo "scale=1; $tx_kib / 1024" | bc`" + if [ $tx_kib -lt 9900 ]; then + printf '%sM' "`echo "scale=1; $tx_kib / 1024" | bc`" + else + if [ $tx_kib -lt 1022976 ]; then + printf '%03dM' "`echo "scale=0; $tx_kib / 1024" | bc`" + else + printf "%sG" "`echo "scale=1; $tx_kib / 1024000" | bc`" + fi + fi else printf %03d ${tx_kib} # leading zeroes so length is constant echo -n "K" -- 2.47.1