From 3d908591fad2415c3cfe6dcd892b312d831381ca Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 2 Feb 2024 19:32:18 +0100 Subject: [PATCH] G1 NOTERIB --- MAKE_G1BILLET.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 1d9eb6d..e9ec2b8 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -228,13 +228,13 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "x" && ${MONTANT} != "___" ]]; convert -font 'Liberation-Sans' \ -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \ -pointsize 150 -fill black -draw 'text 120,380 "'"$MONTANT"'"' \ --pointsize 20 -fill black -draw 'text 340,22 "'"${NOTERIB}:ZEN"'"' \ +-pointsize 20 -fill black -draw 'text 340,22 "'"${NOTERIB}"'"' \ -pointsize 25 -fill black -draw 'text 50,440 "'"$BOTTOM"'"' \ "${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 22 -fill black -draw 'text 300,26 "'"${NOTERIB}:ZEN"'"' \ +-pointsize 22 -fill black -draw 'text 300,26 "'"${NOTERIB}"'"' \ -pointsize 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \ -pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \ -pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \ @@ -259,10 +259,10 @@ composite -compose Over -gravity Center -geometry +30+40 \ # G1PUB QR CODE RIGHT [[ -s ${HOME}/.zen/Astroport.ONE/images/zenticket.png ]] \ -&& amzqr "${NOTERIB}:ZEN" -l H -p "${HOME}/.zen/Astroport.ONE/images/zenticket.png" -c -n QR.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/ \ +&& amzqr "${NOTERIB}" -l H -p "${HOME}/.zen/Astroport.ONE/images/zenticket.png" -c -n QR.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/ \ && convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QR.png -resize 250 ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png \ && rm ${MY_PATH}/tmp/g1billet/${UNIQID}/QR.png \ -|| qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB:ZEN" +|| 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 \