From 990318b2e37d6b238a405f31b139bfa7dc5e616b Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Thu, 26 Oct 2023 00:56:59 +0200
Subject: [PATCH] Get PLAYER "Dessin de MOA" as G1BILLET backgroud image

---
 MAKE_G1BILLET.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index 023d4d4..a7ebb5c 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -98,9 +98,9 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
     p=$(${MY_PATH}/diceware.sh 1 | xargs)
 
     echo "(≖‿‿≖) PGP /?${s}=${USALT}&${p}=${UPEPPER} (PASS=$UNIQID)"
-    echo "/?${s}=${USALT}&${p}=${UPEPPER}"  > ~/.zen/tmp/topgp
-    cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
-    rm ~/.zen/tmp/topgp ## CLEANING CACHE
+    echo "/?${s}=${USALT}&${p}=${UPEPPER}"  > ${MY_PATH}/tmp/topgp
+    cat ${MY_PATH}/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
+    rm ${MY_PATH}/tmp/topgp ## CLEANING CACHE
 
     DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )"
     echo "$DISCO"
@@ -175,8 +175,8 @@ fi
                 G1PUB=$(cat ~/.zen/game/players/.current/.g1pub 2>/dev/null)
 
                 #~ ## GET current PLAYER G1PUB
-                #~ [[ -d ~/.zen/game/players/${STYLE} ]] \
-                    #~ && SRCMAIL=${STYLE} && G1PUB=$(cat ~/.zen/game/players/${STYLE}/.g1pub 2>/dev/null)
+                [[ -d ~/.zen/game/players/${STYLE} ]] \
+                    && SRCMAIL=${STYLE} && G1PUB=$(cat ~/.zen/game/players/${STYLE}/.g1pub 2>/dev/null)
 
                 BILLETFULLNAME=$(echo "${SRCMAIL} ${SECRET1} ${SECRET2}" | sed 's/ /_/g') # em@ai.l_dice_words
 
@@ -185,9 +185,10 @@ fi
                 NEWIMAGIC=$(~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}" | tail -n 1)
                 convert ~/.zen/tmp/${MOATS}/START.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png
 
-                ## GET moa.jpg From current PLAYER TW
-                #~ [[ -s ~/.zen/game/players/${SRCMAIL}/moa.jpg ]] \
-                    #~ && convert ~/.zen/game/players/${SRCMAIL}/moa.jpg  -resize 964x459 -background grey -gravity center -extent 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg
+                #~ ## REPLACE fond.jpg WITH moa.jpg from TW "Dession de PLAYER"
+                [[ -s ~/.zen/game/players/${SRCMAIL}/moa.jpg ]] \
+                    && rm ${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg \
+                    && convert ~/.zen/game/players/${SRCMAIL}/moa.jpg  -resize 964x459 -background grey -gravity center -extent 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg
 
                 mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png