From ba0f91404c11b8f17a547eb67b6198fbe3cf17ea Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Fri, 26 Feb 2021 06:51:32 +0100
Subject: [PATCH] Fix GVA request

---
 scripts/walletsBalance.sh | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/scripts/walletsBalance.sh b/scripts/walletsBalance.sh
index 955d394..6040f55 100755
--- a/scripts/walletsBalance.sh
+++ b/scripts/walletsBalance.sh
@@ -12,30 +12,22 @@ node=$(cut -d '/' -f3 <<<"$DUNITER")
 
 work() {
     for i in $wallets; do
+        exec() {
+            jsonResult=$($JAKLIS idBalance -p $i 2>/dev/null)
+        }
+        exec
+        while [[ $? == 1 ]]; do echo "Erreur $k: $i"; ((k++)); exec; done
+	unset k
 
-        if [[ $1 == "members" ]]; then
-            exec() {
-                jsonResult=$($JAKLIS idBalance -p $i 2>/dev/null)
-            }
-            exec
-            while [[ $? == 1 ]]; do echo "Erreur $k: $i"; ((k++)); exec; done
-	    unset k
+	balance=$(echo "$jsonResult" | jq -r '.balance')
+        username=$(echo "$jsonResult" | jq -r '.username')
+        formatedBalance=$(printf "%-10s | %-45s | %-1s" $balance $i $username)
 
-	    balance=$(echo "$jsonResult" | jq -r '.balance')
-            username=$(echo "$jsonResult" | jq -r '.username')
-            formatedBalance=$(printf "%-10s | %-45s | %-1s" $balance $i $username)
-            htmlBloc="$htmlBloc"$'\n'"<tr><td>$balance</td><td>$i</td><td>$username</td></tr>"
+	if [[ $1 == "members" ]]; then
+            htmlBloc="$htmlBloc"$'\n'"<tr><td>$balance</td><td>$i</td><td><b>$username</b></td></tr>"
             unset username
         else
-            exec() {
-                balance=$($JAKLIS id -p $i 2>/dev/null)
-            }
-            exec
-            while [[ $? == 1 ]]; do echo "Erreur $k: $i"; ((k++)); exec; done
-            unset k
-
-            formatedBalance=$(printf "%-10s | %-45s" $balance $i)
-            htmlBloc="$htmlBloc"$'\n'"<tr><td>$balance</td><td>$i</td><td> </td></tr>"
+	    htmlBloc="$htmlBloc"$'\n'"<tr><td>$balance</td><td>$i</td><td>$username</td></tr>"
         fi
         unset balance