Ran shellcheck, fixed (?) things

1 files changed, 11 insertions, 8 deletions

diff --git a/newmail b/newmail
index 5443d10..d9d1620 100755
--- a/newmail
+++ b/newmail
@@ -4,18 +4,21 @@ servers="gmail posteo gwu"
 
 result=
 regexp='s#^machine \(.*\) login \(.*\) password \(.*\) port \([0-9]*\)$#-u \2:"\3" imaps://\1:\4/INBOX#'
-data=$(gpg --quiet --decrypt $HOME/.authinfo.gpg | grep 993)
+data=$(gpg --quiet --decrypt "$HOME"/.authinfo.gpg | grep 993)
 for server in $servers; do
-    line=$(echo "$data" | grep $server | head -n 1)
-    num=$(curl -s --ssl-reqd $(echo $line | sed "$regexp") -X 'SEARCH UNSEEN' | grep SEARCH | wc -w)
-    if [ "$num" != "2" ]; then
-        count=$(($num - 2))
+    line=$(echo "$data" | grep "$server" | head -n 1)
+    num=$(curl -s --ssl-reqd $(echo "$line" | sed "$regexp") -X 'SEARCH UNSEEN' | grep SEARCH | wc -w)
+    if [ "$num" != "0" ]; then
         if [ -z "$result" ]; then
-            result="$server: $count"
+            result="$server: $num"
         else
-            result="$result, $server: $count"
+            result="$result, $server: $num"
         fi
     fi
 done;
 
-[ -n "$result" ] && echo $result || true
+if [ -n "$result" ]; then
+    echo "$result"
+else
+    true
+fi;