From f034722f8b2083823f254da9b34d1e83b44e81f7 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 16 Oct 2023 22:52:39 +0200 Subject: [PATCH] c mieux --- RUNTIME/REGION.refresh.sh | 4 +++- RUNTIME/SECTOR.refresh.sh | 4 +++- RUNTIME/UPLANET.refresh.sh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index a72a5841..db8a80df 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -27,13 +27,15 @@ CLAT=$(echo ${LAT} | cut -d '.' -f 1) CLON=$(echo ${LON} | cut -d '.' -f 1) REGION="_${CLAT}_${CLON}" echo "REGION ${REGION}" +[[ -s ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.IPNS.html ]] && echo "ALREADY DONE" && exit 0 [[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">>> MANAGING REGION PUBLICATION" || exit 0 ############################################################## REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${REGION}" "${REGION}") [[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1 -echo "REGION WALLET : ${REGIONG1PUB}" + COINS=$($MY_PATH/tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1) + echo "REGION : ${REGION} (${COINS} G1) WALLET : ${REGIONG1PUB}" ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${REGION}" "${REGION}" ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 80450565..2968df10 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -27,13 +27,15 @@ SLAT=$(echo ${LAT} | xargs printf '%.1f\n' | sed s~,~.~g) SLON=$(echo ${LON} | xargs printf '%.1f\n' | sed s~,~.~g) SECTOR="_${SLAT}_${SLON}" echo "SECTOR ${SECTOR}" +[[ -s ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.IPNS.html ]] && echo "ALREADY DONE" && exit 0 [[ "${SECTORNODE}" == "${IPFSNODEID}" ]] && echo ">> MANAGING SECTOR PUBLICATION" || exit 0 ############################################################## SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${SECTOR}" "${SECTOR}") [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating SECTOR WALLET" && exit 1 -echo "${SECTOR} WALLET : ${SECTORG1PUB}" + COINS=$($MY_PATH/tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1) + echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${SECTORG1PUB}" ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SECTOR.priv "${SECTOR}" "${SECTOR}" ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index a65a9619..15dd5f66 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -39,7 +39,9 @@ mkdir ~/.zen/tmp/${MOATS} ############################################################## G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${LAT}" "${LON}") [[ ! ${G1PUB} ]] && echo "ERROR generating WALLET" && exit 1 - echo "ACTUAL UMAP WALLET : ${G1PUB}" + COINS=$($MY_PATH/tools/COINScheck.sh ${G1PUB} | tail -n 1) + echo "UMAP (${COINS} G1) WALLET : ${G1PUB}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${UMAP}.priv "${LAT}" "${LON}" ipfs key rm ${G1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)