diff --git a/lib/functions.sh b/lib/functions.sh index 179b370..8c10f2f 100755 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -79,19 +79,21 @@ web() { } sumSoldes() { - source $GPATH/explorer.sh > /dev/null + source $GPATH/explorer.sh -c > /dev/null - sumRW=$(echo $sumRWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - sumRM=$(echo $sumRMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - sumRT=$(echo $sumRTBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - sumSW=$(echo $sumSWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - sumSM=$(echo $sumSMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - sumST=$(echo $sumSTBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - soldeW=$(echo $soldeWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') - soldeM=$(echo $soldeMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumRW=$(day | jq '.rWallets' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumRM=$(day | jq '.rMembers' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumRT=$(total | jq '.totalReceived' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumSW=$(day | jq '.sWallets' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumSM=$(day | jq '.sMembers' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') + sumSTBrut=$(total | jq '.totalSent') + sumST=$(sed ':a;s/\B[0-9]\{3\}\>/ &/;ta' <<<"$sumSTBrut") + soldeWBrut=$(solde | jq '.soldeWallets') + soldeW=$(sed ':a;s/\B[0-9]\{3\}\>/ &/;ta' <<<"$soldeWBrut") + soldeM=$(solde | jq '.soldeMembers' | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') ### Calcul de la masse monétaire et du pourcentage de Ḡ1 sur les simples portefeuilles - monetaryMassBrut=$($GPATH/explorer.sh mass) + monetaryMassBrut=$(mass | jq .monetaryMass) monetaryMass=$(echo "$monetaryMassBrut" | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta') pourcentSimpleWallet=$(echo "$soldeWBrut*100/$monetaryMassBrut/1" | bc -l | xargs printf %.1f)