From 757be0bfc5366cb250b331678462a4e4621d0d54 Mon Sep 17 00:00:00 2001 From: poka Date: Thu, 24 Sep 2020 21:56:28 +0200 Subject: [PATCH] Rename GPATH in transform_json.sh --- lib/transform_json.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/transform_json.sh b/lib/transform_json.sh index 86fd078..9c5c6ad 100755 --- a/lib/transform_json.sh +++ b/lib/transform_json.sh @@ -3,8 +3,8 @@ # Varialbes n=2 # Nombre de jours pour les pas en abscisse -#SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -#if [[ -e $SCRIPTPATH/.env ]]; then source $SCRIPTPATH/.env; else echo "Veuillez créer votre fichier .env inspiré de .env.example" && exit 1; fi +#GPATH="$( cd "$(dirname "$0")" ; pwd -P )" +#if [[ -e $GPATH/.env ]]; then source $GPATH/.env; else echo "Veuillez créer votre fichier .env inspiré de .env.example" && exit 1; fi ## Ḡ1 reçus @@ -21,13 +21,13 @@ rWallets() { local RW=$(sed '3q;d' <<< $i) local RM=$(sed '4q;d' <<< $i) - local jsonTPL=$(sed s/_DATE/$dateN/g $SCRIPTPATH/tpl/daily.json) + local jsonTPL=$(sed s/_DATE/$dateN/g $GPATH/tpl/daily.json) local jsonTPL=$(sed s/_RWALLETS/$RW/g <<< $jsonTPL) local result+=$(sed s/_RMEMBERS/$RM/g <<< $jsonTPL) done - sed "s/_JSONDATA/$result/g" $SCRIPTPATH/tpl/recus.html > $WEBPATH/graph/recus.html - sed "s/_JSONDATARW/$result/g" $SCRIPTPATH/tpl/mixed.html > $WEBPATH/graph/mixed.html + sed "s/_JSONDATA/$result/g" $GPATH/tpl/recus.html > $WEBPATH/graph/recus.html + sed "s/_JSONDATARW/$result/g" $GPATH/tpl/mixed.html > $WEBPATH/graph/mixed.html } nbrWallets() { @@ -44,12 +44,12 @@ nbrWallets() { local NBRM=$(sed '3q;d' <<< $i) local NBRW=$(sed '4q;d' <<< $i) - local jsonTPL=$(sed s/_DATE/$dateN/g $SCRIPTPATH/tpl/nbr_wallets.json) + local jsonTPL=$(sed s/_DATE/$dateN/g $GPATH/tpl/nbr_wallets.json) local jsonTPL=$(sed s/_NBRWALLETS/$NBRW/g <<< $jsonTPL) local result+=$(sed s/_NBRMEMBERS/$NBRM/g <<< $jsonTPL) done - sed "s/_JSONDATA/$result/g" $SCRIPTPATH/tpl/nbr_wallets.html > $WEBPATH/graph/nbr_wallets.html + sed "s/_JSONDATA/$result/g" $GPATH/tpl/nbr_wallets.html > $WEBPATH/graph/nbr_wallets.html sed -i "s/_JSONDATANBRW/$result/g" $WEBPATH/graph/mixed.html }