From 4000196acbcbf60706d1025b7268b1936e3d0bd3 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sun, 15 May 2022 17:33:14 +0200
Subject: [PATCH] Update index

---
 lib/functions.sh               |  2 +-
 scripts/geoloc-members-json.sh |  8 ++++++--
 tpl/index.html                 | 17 +++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/functions.sh b/lib/functions.sh
index 8740fc1..7eebfa1 100755
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -54,7 +54,7 @@ web() {
 	sed -i "s/_pourcentSimpleWallet/$pourcentSimpleWallet/g" $indexhtml
 	sed -i "s/_nonConsumedUDT/$nonConsumedUDT/g" $indexhtml
 	sed -i "s/_monetaryMass/$monetaryMass/g" $indexhtml
-	sed -i "s/_sleepyG1/$sleepyG1/g" $indexhtml
+	# sed -i "s/_sleepyG1/$sleepyG1/g" $indexhtml
 	[[ -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/_datePrevious/$datePrevious/g" $indexhtml && setPrevious="Oui"
 	[[ -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/_dateNext/$dateNext/g" $indexhtml && setNext="Oui"
 
diff --git a/scripts/geoloc-members-json.sh b/scripts/geoloc-members-json.sh
index 0c951c1..599cabe 100755
--- a/scripts/geoloc-members-json.sh
+++ b/scripts/geoloc-members-json.sh
@@ -7,10 +7,14 @@ source $GPATH/.env
 timeout=120
 startLoop=$(date +%s)
 
-[[ $(ps -aux | grep "[g]eoloc-members") ]] && echo "ERROR: Script is still started... exit." && exit 1
-
 echo "### $(date +%d-%m-%y) ###"
 
+# Exit if script is already alive
+if pidof -o %PPID -x "geoloc-members-json.sh">/dev/null; then
+    echo "Process already running"
+    exit 1
+fi
+
 FILE="/tmp/geoloc-members.json"
 FINAL_LOCATION="$WEBPATH/data/geoloc-members.json"
 FINAL_LOCATION_ALT="$WEBPATH/data/geoloc-members-alt.json"
diff --git a/tpl/index.html b/tpl/index.html
index 3851a67..f149f70 100644
--- a/tpl/index.html
+++ b/tpl/index.html
@@ -24,26 +24,23 @@
 
 <div id="mainbloc">
 <pre>
-Date: <b>_day - _heure</b> 
-Noeud scanné: <b>https://duniter-g1.p2p.legal</b> 
+Date:		<b>_day - _heure</b> 
+Noeud scanné:	<b>https://g1.librelois.fr</b> 
 ---
-Nombre total de portefeuille:	<b>_nbrTotalWallets</b>
+Nombre total de portefeuille:		<b>_nbrTotalWallets</b>
 Nombre de membres:			<b>_nbrMembers</b> (_pourcentMbrs%) 
-Nombre de simple portefeuille:	<b>_nbrSimpleWallets</b> (_pourcentWallets%) 
+Nombre de simple portefeuille:		<b>_nbrSimpleWallets</b> (_pourcentWallets%) 
 ---
 Reçus simples portefeuille:		<b>_sumRW Ḡ1</b>
-Envoyé simples portefeuille:	<b>_sumSW Ḡ1</b>
-Soldes simples portefeuille:	<b>_soldeW Ḡ1</b> (_pourcentSimpleWallet% de la masse monétaire totale)
+Envoyé simples portefeuille:		<b>_sumSW Ḡ1</b>
+Soldes simples portefeuille:		<b>_soldeW Ḡ1</b> (_pourcentSimpleWallet% de la masse monétaire totale)
 ---
 Reçus membres:				<b>_sumRM Ḡ1</b> (sans les DU)
 Envoyé membres:				<b>_sumSM Ḡ1</b>
 Soldes membres:				<b>_soldeM Ḡ1</b> (sans les DU)
 ---
-Masse monétaire:	<b>_monetaryMass Ḡ1</b>
+Masse monétaire:				<b>_monetaryMass Ḡ1</b>
 
----
-<h3>Analyse rapide</h3>
-<b>_sleepyG1%</b> des Ḡ1 n'ont jamais été utilisés.
 </pre>
 </div>