From 21f745c4184a23aaf31db6dfbb12fd7d635b0ca2 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 2 Apr 2024 11:42:03 +0200
Subject: [PATCH] --progress="false"

---
 API/ZONE.sh | 30 +++++++++++++++---------------
 _12345.sh   |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/API/ZONE.sh b/API/ZONE.sh
index 27f64e93..4a9abe70 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -73,11 +73,11 @@ echo "UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTORG1PUB=$SECTORG1PUB SECTORIPN
         SECTOR="_${SLAT}_${SLON}"
         echo "SECTOR = ${SECTOR}"
         ZONEINDEX=$SECTORIPNS
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORNS | tail -n 1)
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORNS | tail -n 1)
+        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/SECTORNS | tail -n 1)
+        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/SECTORNS | tail -n 1)
         ZONEG1PUB=$SECTORG1PUB
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORG1PUB | tail -n 1)
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${SLAT}*_${SLON}*/SECTORG1PUB | tail -n 1)
+        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/SECTORG1PUB | tail -n 1)
+        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/SECTORG1PUB | tail -n 1)
         LAT=${SLAT}
         LON=${SLON}
         JSON="ZONE${SECTOR}_${DEG}.json"
@@ -92,11 +92,11 @@ echo "UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTORG1PUB=$SECTORG1PUB SECTORIPN
         REGION="_${RLAT}_${RLON}"
         echo "REGION = ${REGION}"
         ZONEINDEX=$REGIONIPNS
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONNS | tail -n 1)
-        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONNS | tail -n 1)
+        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_${RLAT}_${RLON}/_*_*/_*_*/REGIONNS | tail -n 1)
+        [[ ! $ZONEINDEX ]] && ZONEINDEX="/ipns/"$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_*_*/_*_*/REGIONNS | tail -n 1)
         ZONEG1PUB=$REGIONG1PUB
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONG1PUB | tail -n 1)
-        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${RLAT}*_${RLON}*/REGIONG1PUB | tail -n 1)
+        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_${RLAT}_${RLON}/_*_*/_*_*/REGIONG1PUB | tail -n 1)
+        [[ ! $ZONEG1PUB ]] && ZONEG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${RLAT}_${RLON}/_*_*/_*_*/REGIONG1PUB | tail -n 1)
         LAT=${RLAT}
         LON=${RLON}
         JSON="ZONE${REGION}_${DEG}.json"
@@ -110,15 +110,15 @@ if [[ ! -s ~/.zen/tmp/${JSON} ]]; then
     ## UMAP LEVEL
     if [[ ${DEG} == "0.001" ]]; then
 
-        swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
-        nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
+        swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/* 2>/dev/null | wc -l )
+        nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/* 2>/dev/null | wc -l )
         totnum=$(( swarmnum + nodenum ))
-        echo " ## UMAP _${LAT}*_${LON}* = ${totnum} PLAYERs"
+        echo " ## UMAP _${LAT}_${LON} = ${totnum} PLAYERs"
 
-        UMAPNS=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TODATENS)
-        [[ ! $UMAPNS ]] && UMAPNS=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TODATENS)
-        G1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/G1PUB)
-        [[ ! $G1PUB ]] && G1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/G1PUB)
+        UMAPNS=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TODATENS | tail -n 1)
+        [[ ! $UMAPNS ]] && UMAPNS=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TODATENS | tail -n 1))
+        G1PUB=$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/G1PUB | tail -n 1))
+        [[ ! $G1PUB ]] && G1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/G1PUB | tail -n 1))
 
         echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' \
             > ~/.zen/tmp/${MOATS}/http.grid
diff --git a/_12345.sh b/_12345.sh
index 31e03c1b..8a6ea5e3 100755
--- a/_12345.sh
+++ b/_12345.sh
@@ -151,7 +151,7 @@ while true; do
 
             ## IPFS GET TO /swarm/${ipfsnodeid}
             echo "GETTING ${nodeip} : /ipns/${ipfsnodeid}"
-            ipfs --timeout 720s get -o ~/.zen/tmp/-${ipfsnodeid}/ /ipns/${ipfsnodeid}/
+            ipfs --timeout 720s get --progress="false" -o ~/.zen/tmp/-${ipfsnodeid}/ /ipns/${ipfsnodeid}/
 
             ## SHOW WHAT WE GET
             echo "__________________________________________________"
@@ -198,7 +198,7 @@ while true; do
                     if [[ ! -d ~/.zen/tmp/swarm/${znod} ]]; then
                         echo "COMPLETING MY SWARM DATA WITH ZNOD=${znod}"
                         mkdir -p ~/.zen/tmp/swarm/${znod}
-                        ipfs --timeout 180s get -o ~/.zen/tmp/swarm/${znod} /ipns/${znod}
+                        ipfs --timeout 180s get --progress="false" -o ~/.zen/tmp/swarm/${znod} /ipns/${znod}
                     else
                         echo "____________ KNOW ${znod}"
                         # TODO : SPEEDUP REFRESH COMPARE _MySwarm.moats AND KEEP LATEST
@@ -252,7 +252,7 @@ while true; do
         ## IPFS GET LAST ONLINE IPFSNODEID MAP
         rm -Rf ~/.zen/tmp/_${IPFSNODEID} 2>/dev/null
         mkdir -p ~/.zen/tmp/_${IPFSNODEID}
-        ipfs get -o ~/.zen/tmp/_${IPFSNODEID}/ /ipns/${IPFSNODEID}/
+        ipfs get --progress="false" -o ~/.zen/tmp/_${IPFSNODEID}/ /ipns/${IPFSNODEID}/
         NSIZE=$(du -b ~/.zen/tmp/_${IPFSNODEID} | tail -n 1 | cut -f 1)
 
         ### CHECK IF SIZE DIFFERENCE ?