From 16874b6716a2f040077cac61b08cf3b21ec74fc6 Mon Sep 17 00:00:00 2001
From: Gregory Chamberlain <gregc@posteo.net>
Date: Sun, 31 May 2020 20:10:53 +0100
Subject: [PATCH 1/3] Remove unnecessary double quotes

---
 .local/bin/statusbar/nettraf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf
index c9b003f..6972b7e 100755
--- a/.local/bin/statusbar/nettraf
+++ b/.local/bin/statusbar/nettraf
@@ -4,18 +4,18 @@
 # transmitted (TX) since the previous time this script ran. So if run every
 # second, gives network traffic per second.
 
-case "$BLOCK_BUTTON" in
+case $BLOCK_BUTTON in
 	3) notify-send "🌐 Network traffic module" "🔻: Traffic received
 🔺: Traffic transmitted" ;;
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog"
+logfile=${XDG_CACHE_HOME:-$HOME/.cache}/netlog
 [ -f "$logfile" ] || echo "0 0" > "$logfile"
 read -r rxprev txprev < "$logfile"
 
-rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))"
-txcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/tx_bytes)))"
+rxcurrent=$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))
+txcurrent=$(($(paste -d '+' /sys/class/net/[ew]*/statistics/tx_bytes)))
 
 printf "🔻%dKiB 🔺%dKiB\\n" "$(((rxcurrent-rxprev)/1024))" "$(((txcurrent-txprev)/1024))"
 

From 63aef514d7b6e0793c01989a58eb0529d56052d9 Mon Sep 17 00:00:00 2001
From: Gregory Chamberlain <gregc@posteo.net>
Date: Sun, 31 May 2020 20:30:52 +0100
Subject: [PATCH 2/3] Refactor nettraf

No longer relies on paste(1p).
---
 .local/bin/statusbar/nettraf | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf
index 6972b7e..42da6d0 100755
--- a/.local/bin/statusbar/nettraf
+++ b/.local/bin/statusbar/nettraf
@@ -10,13 +10,19 @@ case $BLOCK_BUTTON in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-logfile=${XDG_CACHE_HOME:-$HOME/.cache}/netlog
-[ -f "$logfile" ] || echo "0 0" > "$logfile"
-read -r rxprev txprev < "$logfile"
+update() {
+    sum=0
+    for arg; do
+        read -r i < "$arg"
+        sum=$(( "$sum" + "$i" ))
+    done
+    cache=${XDG_CACHE_HOME:-$HOME/.cache}/${1##*/}
+    [ -f "$cache" ] && read -r old < "$cache" || old=0
+    printf %d\\n "$sum" > "$cache"
+    printf %d\\n $(( ("$sum" - "$old") / 1024 ))
+}
 
-rxcurrent=$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))
-txcurrent=$(($(paste -d '+' /sys/class/net/[ew]*/statistics/tx_bytes)))
+rx=$(update /sys/class/net/[ew]*/statistics/rx_bytes)
+tx=$(update /sys/class/net/[ew]*/statistics/tx_bytes)
 
-printf "🔻%dKiB 🔺%dKiB\\n" "$(((rxcurrent-rxprev)/1024))" "$(((txcurrent-txprev)/1024))"
-
-echo "$rxcurrent $txcurrent" > "$logfile"
+printf "🔻%dKiB 🔺%dKiB\\n" "$rx" "$tx"

From 43f0f899ae4a0134930830fbccf7af614c87c92e Mon Sep 17 00:00:00 2001
From: Gregory Chamberlain <gregc@posteo.net>
Date: Sun, 31 May 2020 21:26:05 +0100
Subject: [PATCH 3/3] Fix arithmetic expansions

---
 .local/bin/statusbar/nettraf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf
index 42da6d0..fa9eb30 100755
--- a/.local/bin/statusbar/nettraf
+++ b/.local/bin/statusbar/nettraf
@@ -14,12 +14,12 @@ update() {
     sum=0
     for arg; do
         read -r i < "$arg"
-        sum=$(( "$sum" + "$i" ))
+        sum=$(( $sum + $i ))
     done
     cache=${XDG_CACHE_HOME:-$HOME/.cache}/${1##*/}
     [ -f "$cache" ] && read -r old < "$cache" || old=0
     printf %d\\n "$sum" > "$cache"
-    printf %d\\n $(( ("$sum" - "$old") / 1024 ))
+    printf %d\\n $(( ($sum - $old) / 1024 ))
 }
 
 rx=$(update /sys/class/net/[ew]*/statistics/rx_bytes)