vertical SECRETS

MAKE_G1BILLET.sh

@@ -103,6 +103,7 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
 
     echo "(≖‿‿≖) PGP /?${s}=${USALT}&${p}=${UPEPPER} (PASS=$UNIQID)"
     echo "/?${s}=${USALT}&${p}=${UPEPPER}"  > ${MY_PATH}/tmp/topgp
+    echo "/?salt=${USALT}&pepper=${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
 
@@ -130,7 +131,7 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
 fi
 
 ## TW moa net
-TWIMG="moa_net.png"
+TWIMG="TV.png"
 
 # ZENCARD+@ linked to G1BIILET ipns
 [[ "${STYLE:0:1}" == "@" ]] \
@@ -144,7 +145,7 @@ TWIMG="moa_net.png"
 if [[ ${ASTRONS} != "" ]] ; then
     ASTROLINK="${ASTRONS}"
 else
-    ASTROLINK="https://opencollective.com/made-in-zen"
+    ASTROLINK="https://opencollective.com/monnaie-libre"
 fi
 
     amzqr "${ASTROLINK}" \
@@ -220,10 +221,6 @@ composite -compose Over -dissolve 70% \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg" \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 
-### TEXT OVERLAY
-#~ -pointsize 22 -draw 'text 50,100 "'"Secret 1: ${SECRET1}"'"' \
-#~ -pointsize 22 -fill black -draw 'text 50,130 "'"Secret 2:  $SECRET2"'"' \
-
 if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "x" && ${MONTANT} != "___" ]]; then
 convert -font 'Liberation-Sans' \
 -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \
@@ -233,10 +230,10 @@ convert -font 'Liberation-Sans' \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 else
 convert -font 'Liberation-Sans' \
--pointsize 35 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
+-pointsize 35 -fill black -draw 'text 60,56 "'"$XZUID"'"' \
 -pointsize 22 -fill black -draw 'text 300,26 "'"${NOTERIB}"'"' \
--pointsize 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \
+-pointsize 22 -fill black -annotate 90x90+30+20 "(Secret 1) ${SECRET1}" \
--pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \
+-pointsize 22 -fill black -annotate 90x90+10+20 "(Secret 2) $SECRET2" \
 -pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 fi
@@ -245,14 +242,14 @@ rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
 
 ## ADD SouthWEST
 [[ -s "${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png" ]] && \
-composite -compose Over -gravity SouthWest -geometry +30+30 \
+composite -compose Over -gravity SouthWest -geometry +50+40 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 
 ## ADD CENTER QRCODE
 [[ -s "${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png" ]] && \
-composite -compose Over -gravity Center -geometry +30+40 \
+composite -compose Over -gravity Center -geometry +40+40 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
@@ -265,7 +262,7 @@ composite -compose Over -gravity Center -geometry +30+40 \
 || qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
 
 # AJOUT DU G1PUB QRCODE A DROITE DU BILLET
-composite -compose Over -gravity SouthEast -geometry +35+50 \
+composite -compose Over -gravity SouthEast -geometry +30+50 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"