diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index c6e9df62..a72a5841 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -28,11 +28,6 @@ CLON=$(echo ${LON} | cut -d '.' -f 1) REGION="_${CLAT}_${CLON}" echo "REGION ${REGION}" -REGIONMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1" -REGIONSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1" -echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html -echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html - [[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">>> MANAGING REGION PUBLICATION" || exit 0 ############################################################## @@ -46,6 +41,11 @@ REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MO ############################################################## echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.IPNS.html +REGIONMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" +REGIONSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}" +echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html +echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #~ ## IPFS GET ONLINE SECTORNS @@ -60,8 +60,8 @@ echo "" > TOTL=$((${NL}+${NS})) echo "Number of RSS : "${TOTL} - echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/${TOTL} - IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/${TOTL}) + echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_RSS + IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/N_RSS) ipfs name publish -k ${REGIONG1PUB} /ipfs/${IPFSPOP} diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 28f8749c..9fca4268 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -28,12 +28,6 @@ SLON=$(echo ${LON} | xargs printf '%.1f\n' | sed s~,~.~g) SECTOR="_${SLAT}_${SLON}" echo "SECTOR ${SECTOR}" -SECTORMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1" -SECTORSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1" -echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Map.html -echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Sat.html -############################################################## - [[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">> MANAGING SECTOR PUBLICATION" || exit 0 ############################################################## @@ -47,6 +41,13 @@ SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MO echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.IPNS.html +SECTORMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" +SECTORSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" +echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Map.html +echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Sat.html +############################################################## + + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #~ ## IPFS GET ONLINE SECTORNS @@ -61,8 +62,8 @@ echo "" > TOTL=$((${NL}+${NS})) echo "Number of RSS : "${TOTL} - echo ${TOTL} > ~/.zen/tmp/${MOATS}/${SECTOR}/${TOTL} - IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${SECTOR}/${TOTL}) + echo ${TOTL} > ~/.zen/tmp/${MOATS}/${SECTOR}/N_RSS + IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${SECTOR}/N_RSS) ipfs name publish -k ${SECTORG1PUB} /ipfs/${IPFSPOP} diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 3b0f660d..f5a39f0d 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -98,19 +98,15 @@ mkdir ~/.zen/tmp/${MOATS} ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} fi - ACTINGNODE=${ALLNODES[-1]} ## LAST NODE IN UMAP.refresher - SECTORNODE=${ALLNODES[-2]} - REGIONNODE=${ALLNODES[-3]} + ACTINGNODE=${ALLNODES[1]} ## FIST NODE IN UMAP.refresher echo "* ACTINGNODE=${ACTINGNODE}" - echo "* SECTORNODE=${SECTORNODE}" - echo "* REGIONNODE=${REGIONNODE}" ### SECTOR = 0.1° Planet Slice - ${MY_PATH}/SECTOR.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${SECTORNODE}" + ${MY_PATH}/SECTOR.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${ACTINGNODE}" ### REGION = 1° Planet Slice - ${MY_PATH}/REGION.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${REGIONNODE}" + ${MY_PATH}/REGION.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${ACTINGNODE}" [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \ && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \