re arrange better

2024-02-22 23:34:01 +01:00 · 2024-02-22 23:34:01 +01:00 · 84b544f978
parent becbc20b73
commit 84b544f978
1 changed files with 58 additions and 58 deletions
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@ -69,14 +69,15 @@ for REGION in ${REGIONS[@]}; do
    STRAPS=($(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$')) ## ${STRAPS[@]}
    ACTINGNODE=${STRAPS[0]} ## FIST NODE IN STRAPS
    [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
-            && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
-            && continue
+        && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
+        && continue

    ##############################################################
    REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
    [[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
-            COINS=$($MY_PATH/../tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1)
-            echo "REGION : ${REGION} (${COINS} G1) 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 "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}"
    ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
@ -91,74 +92,73 @@ for REGION in ${REGIONS[@]}; do
    TODATEREGIONNS=$(ipfs key import ${TODATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
    ##############################################################
    ## GET from IPNS
-            ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/
-            # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-            # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-            mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS
-            rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json
-            rm -f ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+    ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/
+    # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

-            ## START WITH LOCAL SECTORS RSS WEEK
-            RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
-                for RSS in ${RSSNODE[@]}; do
-                    [[ $(cat ${RSS}) != "[]" ]] \
-                        && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
-                        && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
-                done
-            NL=${#RSSNODE[@]}
+    # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+    mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS
+    rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json
+    rm -f ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL

-            ## ADD SWARM SECTORS RSS WEEK
-            RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
-                for RSS in ${RSSWARM[@]}; do
-                    [[ $(cat ${RSS}) != "[]" ]] \
-                        && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
-                        && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
-                done
-            NS=${#RSSWARM[@]}
+    ## START WITH LOCAL SECTORS RSS WEEK
+    RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
+    for RSS in ${RSSNODE[@]}; do
+        [[ $(cat ${RSS}) != "[]" ]] \
+            && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
+            && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+    done
+    NL=${#RSSNODE[@]}

-            ## CREATE /.all.json FROM *.rss.json
-            ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${MOATS}/${REGION}/RSS
+    ## ADD SWARM SECTORS RSS WEEK
+    RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/SECTORS/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
+    for RSS in ${RSSWARM[@]}; do
+        [[ $(cat ${RSS}) != "[]" ]] \
+            && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
+            && ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
+    done
+    NS=${#RSSWARM[@]}

-            ## REMOVE SECTORS PARTS
-            rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/*.week.rss.json
+    ## CREATE /.all.json FROM *.rss.json
+    ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${MOATS}/${REGION}/RSS

-            ## MAKE FINAL _${REGLAT}_${REGLON}.week.rss.json
-            mv  ~/.zen/tmp/${MOATS}/${REGION}/RSS/.all.json \
-                    ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json
+    ## REMOVE SECTORS PARTS
+    rm -f ~/.zen/tmp/${MOATS}/${REGION}/RSS/*.week.rss.json

-            ## PREPARING JOURNAL
+    ## MAKE FINAL _${REGLAT}_${REGLON}.week.rss.json
+    mv  ~/.zen/tmp/${MOATS}/${REGION}/RSS/.all.json \
+            ~/.zen/tmp/${MOATS}/${REGION}/RSS/_${REGLAT}_${REGLON}.week.rss.json

-            rm -Rf ~/.zen/tmp/${IPFSNODEID}/REGIONS ## TODO REMOVE
-            mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}
+    ## PREPARING JOURNAL
+    mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}

-            RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL 2>/dev/null)
+    ###################################
+    ## NODE PUBLISH REGION TODATENS LINK
+    echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${TODATEREGIONNS}'\" />" \
+        > ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/_index.html

-            cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \
-                ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md
+    #~ ## DEMO : PREPARE Ask.IA link - PROD will be launched during RUNTIME.
+    #~ echo "<meta http-equiv=\"refresh\" content=\"0; url='https://api.copylaradio.com/tellme/?cid=/ipfs/${RWEEKCID}'\" />" \
+                #~ > ~/.zen/tmp/${MOATS}/${REGION}/Ask.IA._${REGLAT}_${REGLON}.redir.html

-            ###################################
-            ## NODE PUBLISH REGION TODATENS LINK
-            echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${TODATEREGIONNS}'\" />" \
-                > ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/_index.html
+    TOTL=$((${NL}+${NS}))
+    # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+    echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL}

-            #~ ## DEMO : PREPARE Ask.IA link - PROD will be launched during RUNTIME.
-            #~ echo "<meta http-equiv=\"refresh\" content=\"0; url='https://api.copylaradio.com/tellme/?cid=/ipfs/${RWEEKCID}'\" />" \
-                        #~ > ~/.zen/tmp/${MOATS}/${REGION}/Ask.IA._${REGLAT}_${REGLON}.redir.html
+    rm ~/.zen/tmp/${MOATS}/${REGION}/TODO
+    rm ~/.zen/tmp/${MOATS}/${REGION}/N_*

-            TOTL=$((${NL}+${NS}))
-            # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-            echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL}
+    echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL}

-            rm ~/.zen/tmp/${MOATS}/${REGION}/TODO
-            rm ~/.zen/tmp/${MOATS}/${REGION}/N_*
+    RWEEKCID=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL 2>/dev/null)
+    if [[ ${RWEEKCID} ]]; then
+        echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipfs/${RWEEKCID}'\" />" \
+            > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
+        cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \
+            ~/.zen/tmp/${IPFSNODEID}/UPLANET/REGIONS/_${REGLAT}_${REGLON}/JOURNAL.md
+    fi

-            echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL}
-
-            [[ ${RWEEKCID} ]] && echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipfs/${RWEEKCID}'\" />" \
-                        > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
-
-            IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${REGION}/* | tail -n 1)
-            ipfs name publish -k ${TODATE}${REGIONG1PUB} /ipfs/${IPFSPOP}
+    IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${REGION}/* | tail -n 1)
+    ipfs name publish -k ${TODATE}${REGIONG1PUB} /ipfs/${IPFSPOP}


    ipfs key rm ${REGIONG1PUB} ${YESTERDATE}${REGIONG1PUB} > /dev/null 2>&1