From 5500a240c2739b17b999fc3f9beda8cd7d6bb66c Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 13 Oct 2023 12:33:47 +0200
Subject: [PATCH] Copy same UMAP TW & RSS from SWARM

---
 20h12.process.sh           |  1 -
 RUNTIME/UPLANET.refresh.sh | 17 ++++++++++-------
 _12345.sh                  |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/20h12.process.sh b/20h12.process.sh
index 8a6ff958..a1d9a86c 100755
--- a/20h12.process.sh
+++ b/20h12.process.sh
@@ -10,7 +10,6 @@ start=`date +%s`
 echo "20H12 (♥‿‿♥) $(hostname -f) $(date)"
 espeak "Ding" > /dev/null 2>&1
 
-## CLEANING  ~/.zen/tmp
 rm -Rf ~/.zen/tmp/*
 
 ## IPFS DAEMON STATUS
diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh
index 5a68ebdc..8e5438b7 100755
--- a/RUNTIME/UPLANET.refresh.sh
+++ b/RUNTIME/UPLANET.refresh.sh
@@ -57,23 +57,25 @@ mkdir ~/.zen/tmp/${MOATS}
         [[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} || ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} ]] \
             && echo ">>> WARNING - UMAP IS BAD FORMAT - PLEASE MONITOR KEY -" \
             && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} \
-            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} \
-            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS
+            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}
+
+        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS
+        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW
 
  ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY
-        cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/RSS/
+        cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/
         RSSFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/RSS/*.rss.json 2>/dev/null))
         for RSSFILE in ${RSSFILES[@]}; do
-            cp -v ${RSSFILE} ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/RSS/
+            cp -v ${RSSFILE} ~/.zen/tmp/${MOATS}/${UMAP}/RSS/
         done
 
 ## COLLECT TW LINKS FOR SWARM
-        cp R ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/TW/
+        cp R ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/TW/
         TWFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
         for TWRED in ${TWFILES[@]}; do
             ZMAIL=$(echo ${TWRED} | rev | cut -d '/' -f 2 | rev)
-            mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/TW/${ZMAIL}
-            cp -v ${TWRED} ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/TW/${ZMAIL}/
+            mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW/${ZMAIL}
+            cp -v ${TWRED} ~/.zen/tmp/${MOATS}/${UMAP}/TW/${ZMAIL}/
         done
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -99,6 +101,7 @@ mkdir ~/.zen/tmp/${MOATS}
 
         [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
             && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
+            && rm -Rf ~/.zen/tmp/${MOATS}
             && continue
             ########################################
             # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PASSING THERE MAKE IPFSNODEID UMAP REFRESHER
diff --git a/_12345.sh b/_12345.sh
index 0569795d..0e387bb2 100755
--- a/_12345.sh
+++ b/_12345.sh
@@ -60,7 +60,6 @@ echo "$(date -u)" > ~/.zen/tmp/${IPFSNODEID}/_MySwarm.staom
 
 ## PUBLISH CHANNEL IPNS
     echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${CHAN}'\" />" > ~/.zen/tmp/${IPFSNODEID}/_MySwarm.$(myHostName).html
-    rm ~/.zen/tmp/${IPFSNODEID}/_MySwarm.ipns 2>/dev/null ## REMOVE AFTER PROTOCOL UPDATE PROPAGATION
 
 ############################################################
 ############################################################