From bd0abd9c39b7d4f4b6943d4684fbab3a4b1bc155 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 16 Oct 2023 22:37:57 +0200
Subject: [PATCH] scorpio 1st UPlanet refresher

---
 A_boostrap_nodes.txt       |  6 +++---
 RUNTIME/SECTOR.refresh.sh  |  2 +-
 RUNTIME/UPLANET.refresh.sh | 20 +++-----------------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/A_boostrap_nodes.txt b/A_boostrap_nodes.txt
index c0dcd04c..681626b5 100644
--- a/A_boostrap_nodes.txt
+++ b/A_boostrap_nodes.txt
@@ -1,15 +1,15 @@
 # CONTAINS Address of 1st Bootstrap Stations (24/24 Public IP) - DO NOT EDIT MANUALY -
 # https://ipfs.copylaradio.com ipfs.copylaradio.com
 #################################################################
+# scorpio.copylaradio.com
+/dnsaddr/scorpio.copylaradio.com/p2p/12D3KooWS8EiLNay8qVnFaULpxW1X9sGZZz4wV8E6E3QEwCRktry
+
 # astroport.libra.copylaradio.com
 /ip4/149.102.158.67/tcp/4001/p2p/12D3KooWL2FcDJ41U9SyLuvDmA5qGzyoaj2RoEHiJPpCvY8jvx9u
 
 # astroport.cancer.copylaradio.com
 # /ip4/185.202.238.69/tcp/4001/p2p/12D3KooWDYpPdfCFf3CbKpcLNmyA2vmJs4JY55k8yje9R1MxSgdB
 
-# scorpio.copylaradio.com
-/dnsaddr/scorpio.copylaradio.com/p2p/12D3KooWS8EiLNay8qVnFaULpxW1X9sGZZz4wV8E6E3QEwCRktry
-
 # astroport.sonic.copylaradio.com
 /ip4/161.97.174.60/tcp/4001/p2p/12D3KooWJnzYzJBtruXZwUQJriF1ePtDQCUQp4aNBV5FjpYVdfhc
 
diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh
index 9fca4268..80450565 100755
--- a/RUNTIME/SECTOR.refresh.sh
+++ b/RUNTIME/SECTOR.refresh.sh
@@ -28,7 +28,7 @@ SLON=$(echo ${LON} | xargs printf '%.1f\n' | sed s~,~.~g)
 SECTOR="_${SLAT}_${SLON}"
 echo "SECTOR ${SECTOR}"
 
-[[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">> MANAGING SECTOR PUBLICATION" || exit 0
+[[ "${SECTORNODE}" == "${IPFSNODEID}" ]] && echo ">> MANAGING SECTOR PUBLICATION" || exit 0
 
 ##############################################################
 SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${SECTOR}" "${SECTOR}")
diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh
index f5a39f0d..a65a9619 100755
--- a/RUNTIME/UPLANET.refresh.sh
+++ b/RUNTIME/UPLANET.refresh.sh
@@ -132,7 +132,7 @@ mkdir ~/.zen/tmp/${MOATS}
         done
 
 ## COLLECT TW LINKS FOR SWARM
-        cp R ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/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)
@@ -160,9 +160,6 @@ mkdir ~/.zen/tmp/${MOATS}
             && [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/Usat.jpg ]] && killall chrome
 
         ##############################################################
-        ## ERASE FOR ALL NODE PROTOCOL UGRADE
-        rm ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json
-        ##############################################################
     if [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json ]]; then
         ##############################################################
         ## CALCULATE SURROUNDING UMAPS
@@ -290,24 +287,13 @@ mkdir ~/.zen/tmp/${MOATS}
         ## GET 100KM GCHANGE ADS ( https://data.gchange.fr )
         ${MY_PATH}/../tools/gchange_get_50km_around_LAT_LON_ads.sh ${LAT} ${LON} > ~/.zen/tmp/${MOATS}/${UMAP}/gchange50.json
 
-        ## CREATE GCHANGE ACCOUNT ??!!
+        ## CREATE GCHANGE ACCOUNT ??!! DO ANYTHING RELATED TO UMAP
 
 
     ### SET navigator.html ## MAKE EVOLVE template/umap.html
         cp ${MY_PATH}/../templates/umap.html ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html
         cat ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html | sed "s~Umap~Usat~g" > ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Usat.html
 
-    ### REFRESH PLAYERS DATA (SHOULD BE THERE, but Station rebuilds it )
-    # FIND WHICH PLAYERS MATCH SAME "_LAT_LON" IN ~/.zen/game/players/*/.umap
-        find ~/.zen/game/players -type f -name ".umap" -exec grep -l "${UMAP}" {} \; | while read umap_file; do
-            player_dir=$(dirname "$umap_file")
-            player_name=$(basename "$player_dir")
-            echo "MATCHING $player_name"
-            playertw=$(cat ${player_dir}/.playerns)
-            mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW/${player_name}
-            echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${playertw}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/TW/${player_name}/index.html
-        done
-
 ########################################################
 ## ACTIVATE IN CASE OF PROTOCOL BRAKE
 ## TODO : BACKUP STATE IN // PRIVATE KEY
@@ -331,7 +317,7 @@ mkdir ~/.zen/tmp/${MOATS}
             && echo "${MOATS}" > ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/_moats \
             && UMAPROOT=$(ipfs add -rwHq  ~/.zen/tmp/${MOATS}/${UMAP}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}"
 
-        echo "PUBLISHING NEW UMAPROOT : http://ipfs.localhost:8080/ipfs/${UMAPROOT}"
+        echo "PUBLISHING NEW UMAPROOT : ${myIPFS}/ipfs/${UMAPROOT}"
 
             ipfs name publish --key=${G1PUB} /ipfs/${UMAPROOT}
             end=`date +%s`