http://g1billet.localhost:33101/?montant=___&style=xbian

MAKE_G1BILLET.sh

@@ -75,23 +75,22 @@ then
         ## IT IS AN ASTRONAUTENS IPNS LINK
         USALT=$(echo "$SALT" | jq -Rr @uri)
         UPEPPER=$(echo "$SECRET" | jq -Rr @uri)
-        DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
-        echo "${DISCO}" \
+        echo "/?salt=${USALT}&pepper=${UPEPPER}" \
         | gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
 
-        # qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
-
+        DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )"
+        echo "$DISCO"
         ## Add logo to QRCode
-        cp ${MY_PATH}/images/astrologo_nb.png -resize ${MY_PATH}/tmp/fond.png
+        cp ${MY_PATH}/images/astrologo_nb.png ${MY_PATH}/tmp/fond.png
 
         ## MAKE amzqr WITH astro:// LINK
-        amzqr  "$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr -d '\n')" \
-                    -d ${MY_PATH}/tmp \
+        amzqr -d ${MY_PATH}/tmp \
                     -l H \
-                    -p ${MY_PATH}/tmp/fond.png
+                    -p ${MY_PATH}/tmp/fond.png \
+                    "$DISCO"
 
         ## ADD PLAYER EMAIL
-        convert -gravity northwest -pointsize 28 -fill black -draw "text 5,5 \"$PLAYER\"" ${MY_PATH}/tmp/fond_qrcode.png ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png
+        convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"$EMAIL\"" ${MY_PATH}/tmp/fond_qrcode.png ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png
         convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png
 
         composite -compose Over -gravity SouthWest -geometry +50+50 \
@@ -101,6 +100,16 @@ then
 
         rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
 
+        if [[ ${STYLE} == "xbian" ]]; then
+            amzqr "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" -l H -p "$MY_PATH/images/moa_net.png" -c -n QRTWavatar.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/
+            convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 260 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png
+            composite -compose Over -gravity Center -geometry +40+40 \
+            "${MY_PATH}/tmp/g1billet/${UNIQID}/300.png" \
+            "${MY_PATH}/tmp/${BILLETNAME}.jpg" \
+            "${MY_PATH}/tmp/${BILLETNAME}.jpg"
+        fi
+
+
     fi
 
     # ENTETE ET BAS DE BILLET
@@ -141,7 +150,7 @@ convert -font 'Liberation-Sans' \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 else
 convert -font 'Liberation-Sans' \
--pointsize 40 -fill black -draw 'text 50,60 "'"$XZUID"'"' \
+-pointsize 40 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
 -pointsize 20 -fill black -draw 'text 380,26 "'"${NOTERIB}"'"' \
 -pointsize 30 -draw 'text 50,90 "'"Secret 1: $SALT"'"' \
 -pointsize 30 -fill black -draw 'text 50,120 "'"Secret 2: $SECRET"'"' \
@@ -150,6 +159,6 @@ convert -font 'Liberation-Sans' \
 fi
 
 rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
-## TODO STORE XZUID & G1PUB into ASTROPORT/IPFS, as FUTURE travelers...
+
 exit 0