From 924808ac04a3bd77a501f00a94ac518932ea0c51 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 18 Oct 2023 02:41:17 +0200 Subject: [PATCH] SECTOR calculation error correction --- RUNTIME/SECTOR.refresh.sh | 4 ++-- RUNTIME/UPLANET.refresh.sh | 4 ++-- tools/RSS2UPlanetTW.sh | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index b2ac0515..191af400 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -23,8 +23,8 @@ SECTORNODE=$5 [[ ! -d ~/.zen/tmp/${MOATS-undefined}/${UMAP-undefined} ]] && echo "MISSING UMAP CONTEXT" && exit 1 -SLAT=$(echo ${LAT} | xargs printf '%.1f\n' | sed s~,~.~g) -SLON=$(echo ${LON} | xargs printf '%.1f\n' | sed s~,~.~g) +SLAT="${LAT::-1}" +SLON="${LON::-1}" SECTOR="_${SLAT}_${SLON}" echo "SECTOR ${SECTOR}" [[ -s ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.IPNS.html ]] && echo "ALREADY DONE" && exit 0 diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index e2972614..2346a742 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -137,14 +137,14 @@ mkdir ~/.zen/tmp/${MOATS} ## 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}/RSS/ + cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/ 2>/dev/null RSSFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/RSS/*.rss.json 2>/dev/null)) for RSSFILE in ${RSSFILES[@]}; do cp ${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}/TW/ + cp -r ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/TW/ 2>/dev/null 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) diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh index f059ef0d..b573c5d6 100755 --- a/tools/RSS2UPlanetTW.sh +++ b/tools/RSS2UPlanetTW.sh @@ -40,7 +40,8 @@ for title in "$titles"; do [[ -s ~/.zen/tmp/${MOATS}/${SECTOR}.html ]] \ && rm ~/.zen/tmp/${MOATS}/${SECTOR}/TW/index.html \ - && mv ~/.zen/tmp/${MOATS}/${SECTOR}.html ~/.zen/tmp/${MOATS}/${SECTOR}/TW/index.html + && mv ~/.zen/tmp/${MOATS}/${SECTOR}.html ~/.zen/tmp/${MOATS}/${SECTOR}/TW/index.html \ + && echo "SECTOR TW UPDATED" else