From e16d200333758a0fa6220ea6d1a1f0f511436cb2 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 4 Mar 2023 00:22:08 +0100
Subject: [PATCH] a new day of freedom

---
 ASTROBOT/PLAYER.refresh.sh    | 4 ++--
 ASTROBOT/VOEUX.refresh.sh     | 6 ++++--
 ping_bootstrap.sh             | 4 +++-
 www/PasseportTerre/index.html | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh
index c636209c..ea5d58a1 100755
--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@@ -199,8 +199,8 @@ for PLAYER in ${PLAYERONE[@]}; do
     echo $MOATS > ~/.zen/game/players/$PLAYER/ipfs/moa/.moats
 
     echo "================================================"
-    echo "$PLAYER : $myIPFS/ipns/$ASTRONAUTENS"
-    echo " = /ipfs/$TW"
+    echo " MAJ TW $PLAYER : = /ipfs/$TW"
+    echo "  $myIPFSGW/ipns/$ASTRONAUTENS"
     echo "================================================"
 
 ######################### PLAYER_feed
diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh
index 42a72fc4..0e765c55 100755
--- a/ASTROBOT/VOEUX.refresh.sh
+++ b/ASTROBOT/VOEUX.refresh.sh
@@ -21,7 +21,7 @@ MOATS="$2"
     ASTRONS=$(cat ~/.zen/game/players/${PLAYER}/.playerns 2>/dev/null)
 
     ## REFRESH ASTRONAUTE TW
-    ASTRONAUTENS=$(ipfs key list -l | grep ${PLAYER} | cut -d ' ' -f1)
+    ASTRONAUTENS=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)
     [[ ! $ASTRONAUTENS ]] && echo "WARNING No ${PLAYER} in keystore --" && ASTRONAUTENS=$ASTRONS
     [[ ! $ASTRONAUTENS ]] && echo "Missing ${PLAYER} IPNS KEY - CONTINUE --" && exit 1
 
@@ -108,14 +108,16 @@ do
         ##################################
         ## TODO JOIN WITH FRIENDS JSONS
         ################################## MOA MAINTENANT
-        echo  ">>> MOA § $myIPFS/$VOEUNS/_${PLAYER}.tiddlers.json"
+        echo  ">>> EXPORT [tag[G1${WISHNAME}]!tag[G1Voeu]] § $myIPFSGW/$VOEUNS/_${PLAYER}.tiddlers.json"
         tiddlywiki --load $INDEX \
                  --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} \
                  --render '.'_ ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]'
 
         ##################################
         ## MAKE EARTH MAP TILES
+        echo
         echo "DEBUG : s~_LIBRA_~$(myIpfsGw)~g s~_G1VOEU_~${WISHNAME}~g s~_PLAYER_~${PLAYER}~g s~_VOEUNS_~${VOEUNS}~g s~_ASTRONAUTENS_~${ASTRONAUTENS}~g"
+        echo
         ##################################
         cat $MY_PATH/../www/PasseportTerre/index.html \
         | sed -e "s~_LIBRA_~$(myIpfsGw)~g" \
diff --git a/ping_bootstrap.sh b/ping_bootstrap.sh
index 061ed71d..96b72a14 100755
--- a/ping_bootstrap.sh
+++ b/ping_bootstrap.sh
@@ -4,11 +4,13 @@ ipfs stats dht wan
 
 for bootnode in $(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#");
     do
+        echo
         ipfsnodeid=${bootnode##*/}
+        ipfs swarm peers | grep $bootnode
         ipfs ping -n 3 $bootnode
         [ $? = 0 ] && ipfs swarm connect $bootnode \
                         || echo "BAD NODE $bootnode"
-        ipfs swarm peers | grep $bootnode
+        echo "*****"
 
     done
 
diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html
index 8a4dba54..c0a97a8d 100644
--- a/www/PasseportTerre/index.html
+++ b/www/PasseportTerre/index.html
@@ -103,9 +103,9 @@
     <div class="subtitle">One Planet</div>
     <div id="demo">
       <div id="description">
-        <h3>ENTER Web3</h3>
+        <h3>ENTER THE GAME</h3>
 
-               <h2>Install <a href="https://cesium.app">Cesium</a>. Be the GAME !</h2>
+               <h2>Install <a href="https://cesium.app">Cesium</a> !</h2>
         <p><a href="https://ipfs.copylaradio.com/ipns/_ASTRONAUTENS_">
             <img src="/ipfs/QmWUpjGFuF7NhpXgkrCmx8Tbu4xjcFpKhE7Bsvt6HeKYxu/g1ticket_qrcode.png" width=65%>
         </a></p>