From b2e566410f8239d990d90e57839f53ab3153d7d4 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 3 Sep 2022 15:41:15 +0200
Subject: [PATCH] tools/tools

---
 G1VOEUX.sh               | 12 ++++++++----
 start.sh                 |  6 +++---
 tools/GCHANGE.process.sh |  0
 tools/PLAYER.refresh.sh  |  5 +++--
 4 files changed, 14 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 tools/GCHANGE.process.sh

diff --git a/G1VOEUX.sh b/G1VOEUX.sh
index 8ec077d7..b7300dec 100755
--- a/G1VOEUX.sh
+++ b/G1VOEUX.sh
@@ -233,15 +233,19 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE
     $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/qrtw.dunikey -n "https://g1.data.presles.fr" set --name "G1Voeu $PEPPER" --avatar "/home/$USER/.zen/Astroport.ONE/images/logojune.jpg" --site "https://astroport.com/ipns/$VOEUXNS" #CESIUM+
     [[ ! $? == 0 ]] && echo "CESIUM PROFILE CREATION FAILED !!!!"
 
+    echo "************************************************************"
+    echo "Hop, Une June pour ce Voeu"
+    echo $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $WISHKEY -c \'"$VOEUXNS G1Voeu $PEPPER"\' -m -v
+    echo "************************************************************"
 
+    $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $WISHKEY -c "$VOEUXNS G1Voeu $PEPPER" -m -v
+    echo "************************************************************"
+    echo
     echo "Astronaute Ŋ1 : http://127.0.0.1:8080/ipns/$ASTRONAUTENS"
 
     echo "CAPSULE A REVE $PEPPER : http://127.0.0.1:8080/ipns/$VOEUXNS"
 
-    echo "Hop, Une June pour ce Voeu"
-    $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $WISHKEY -c "$VOEUXNS G1Voeu $PEPPER" -m -v
-    echo "************************************************************"
-    echo
+
 done
 
 exit 0
diff --git a/start.sh b/start.sh
index 43ecc367..f67611ad 100755
--- a/start.sh
+++ b/start.sh
@@ -78,7 +78,7 @@ ASTRONAUTENS=$(ipfs key list -l | grep -w "$PLAYER" | cut -d ' ' -f 1)
 echo "Votre MOA : http://127.0.0.1:8080/ipns/$ASTRONAUTENS"
 
 PS3="$PLAYER choisissez : __ "
-choices=("AJOUTER VLOG" "CREER UN VOEU" "IMPRIMER VOEU" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER")
+choices=("AJOUTER VLOG" "CREER UN VOEU" "CREER G1ROND" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER")
 select fav in  "${choices[@]}"; do
     case $fav in
     "IMPRIMER VISA")
@@ -124,8 +124,8 @@ select fav in  "${choices[@]}"; do
         #~/.zen/astrXbian/ajouter_video.sh
         ;;
 
-    "IMPRIMER VOEU")
-        PS3='Choisissez un de vos voeux ___ '
+    "CREER G1ROND")
+        PS3='Choisissez le voeux ___ '
         voeux=($(ls ~/.zen/game/players/$PLAYER/voeux 2>/dev/null))
 
         select voeu in "${voeux[@]}"; do
diff --git a/tools/GCHANGE.process.sh b/tools/GCHANGE.process.sh
old mode 100644
new mode 100755
diff --git a/tools/PLAYER.refresh.sh b/tools/PLAYER.refresh.sh
index 360ab82a..1c91f482 100755
--- a/tools/PLAYER.refresh.sh
+++ b/tools/PLAYER.refresh.sh
@@ -32,7 +32,7 @@ for PLAYER in $(ls ~/.zen/game/players/); do
         echo "ERROR IPNS TIMEOUT. Unchanged local backup..."
         continue
     else
-        ## Replace tube links with downloaded video
+        ## Replace tube links with downloaded video ## TODO create LOG tiddler
         $MY_PATH/TUBE.copy.sh ~/.zen/tmp/astro/index.html $PLAYER
         echo "DIFFERENCE ?"
         DIFF=$(diff ~/.zen/tmp/astro/index.html ~/.zen/game/players/$PLAYER/ipfs/moa/index.html)
@@ -89,8 +89,9 @@ if [[ $OLDIG1BAR == ""  ]]; then # CREATE Tiddler
     "type": "'text/vnd.tiddlywiki'",
     "ipns": "'/ipns/$wishns'",
     "ipfs": "'/ipfs/$IG1BAR'",
+    "player": "'/ipfs/$PLAYER'",
     "text": "'$TEXT'",
-    "tags": "'g1voeu g1${wishname}'"
+    "tags": "'g1voeu g1${wishname} $PLAYER'"
   }
 ]
 ' > ~/.zen/tmp/g1${wishname}.bank.json