From 84247d419ebdafbc64dfc32f930514d04fb66010 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 17 Nov 2023 03:37:05 +0100 Subject: [PATCH] some twerks --- G1BILLETS.sh | 18 +++++++++--------- MAKE_G1BILLET.sh | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 26041d5..4a4bc02 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -14,7 +14,7 @@ ME="${0##*/}" || IMAGES="images" ################################################################################ -# Create different king of G1BILLET(s) with $MONTANT DU or TW IPNS + G1CARD +# Create different king of G1BILLET(s) with $MONTANT DU or TW IPNS + ZENCARD # ${MY_PATH}/G1BILLETS.sh 5 ticket 2 # MONTANT # STYLE # SECURITE ################################################################################ MONTANT="$1" @@ -42,10 +42,10 @@ if [[ $MONTANT != "daemon" ]]; then echo "G1BILLET FACTORY MONTANT=$MONTANT DICE=$DICE" echo "$STYLE : $MY_PATH/${IMAGES}/$STYLE" - ## CHECK IF STYLE IS EMAIL => G1CARD+@ IPFS G1BILLET + ## CHECK IF STYLE IS EMAIL => ZENCARD+@ IPFS G1BILLET if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then - echo "ASTROPORT $STYLE :: G1CARD+@" + echo "ASTROPORT $STYLE :: ZENCARD+@" # echo "PLAYER : $STYLE" EMAIL=${STYLE} DICE=5 @@ -67,7 +67,7 @@ if [[ $MONTANT != "daemon" ]]; then [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/fond.jpg- EXIT" && echo $ERROR && exit 1 [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/logo.png ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/logo.png- EXIT" && echo $ERROR && exit 1 - ## THIS IS THE PASS for G1CARD + ## THIS IS THE PASS for ZENCARD UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5) [ $DICE -gt 4 ] && UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) [ $DICE -gt 6 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${RANDOM}${RANDOM}" | tail -c-7) @@ -175,11 +175,11 @@ else if [[ $pre == "_" ]]; then OPT="${OPT}" elif [[ $pre == "x" ]]; then - OPT="${OPT}" + OPT="${OPT}" elif [[ $(echo ${stname} | grep '@') && -s ~/.zen/Astroport.ONE/tools/VOEUX.print.sh ]]; then - OPT="${OPT}" + OPT="${OPT}" else - OPT="${OPT}" + OPT="${OPT}" fi done @@ -263,8 +263,8 @@ function countdown() { echo "==================================================" echo "G1BILLET x 6 : $HNAME:33101" echo "G1BILLET+ x 6 : $HNAME:33101/?montant=0&style=_&dice=4" - echo "G1CARD : $HNAME:33101/?montant=10&style=saubole" - echo "G1CARD+TW : $HNAME:33101/?montant=0&style=astro${RANDOM}@yopmail.com" + echo "ZENCARD : $HNAME:33101/?montant=10&style=saubole" + echo "ZENCARD+TW : $HNAME:33101/?montant=0&style=astro${RANDOM}@yopmail.com" echo "==================================================" echo "LOG : tail -f ${MY_PATH}/tmp/G1BILLETS.log" echo "==================================================" diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index a7ebb5c..a06a922 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -82,7 +82,7 @@ esac ## UPPER RIGHT SIGN (g1.png) cp "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" -## ♥Box :: G1CARD or G1ASTRO +## ♥Box :: ZENCARD or ASTROID BOTTOM="$(date) :: ♥Box :: _G1BILLET_ :: $(hostname) ::" XZUID="__________@__________" @@ -115,8 +115,8 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z "$DISCO" ## ADD PLAYER EMAIL - convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"${EMAIL}\"" ${MY_PATH}/tmp/fond_qrcode.png ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.G1CARD.png - convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.G1CARD.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.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}.ZENCARD.png + convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.ZENCARD.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc @@ -125,7 +125,7 @@ fi ## TW moa net TWIMG="moa_net.png" -# G1CARD+@ linked to G1BIILET ipns +# ZENCARD+@ linked to G1BIILET ipns [[ "${STYLE:0:1}" == "@" ]] \ && TWIMG="pirate_map.png" @@ -150,7 +150,7 @@ fi [[ "${EMAIL}" != "" ]] && XZUID="${EMAIL}" - ## ♥Box :: G1BILLET+ :: G1CARD :: G1(TW) + ## ♥Box :: G1BILLET+ :: ZENCARD :: G1(TW) # GIBILLET dice > 3 => G1BILLET+ [[ "${STYLE:0:1}" == "_" ]] \ @@ -159,15 +159,15 @@ fi [[ "${STYLE:0:1}" != "_" ]] \ && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \ - && BOTTOM="$(date) :: ♥Box :: G1CARD :: $(hostname) ::" + && BOTTOM="$(date) :: ♥Box :: ZENCARD :: $(hostname) ::" [[ "${STYLE:0:1}" == "x" ]] \ && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \ - && BOTTOM="$(date) :: ♥Box :: G1CARD+TW :: $(hostname) ::" + && BOTTOM="$(date) :: ♥Box :: ZENCARD+TW :: $(hostname) ::" if [[ "${STYLE:0:1}" == "@" || "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] ; then #~ ########################## G1Voeu _ G1BILLET linking ## - ## Astroport.ONE LINKING :: STYLE=EMAIL :: G1CARD+@ + ## Astroport.ONE LINKING :: STYLE=EMAIL :: ZENCARD+@ # CREATE @PASS (G1G1BILLET+ G1Voeu derivated keys) MOATS=$(date -u +"%Y%m%d%H%M%S%4N") @@ -196,11 +196,11 @@ fi #SIGN & HIDE SECRETS #~ NOTERIB="https://ipfs.asycn.io/ipns/$BILLNS" XZUID=${SRCMAIL} - BOTTOM="$(date) :: ♥Box :: G1CARD+@ :: $(hostname) ::" + BOTTOM="$(date) :: ♥Box :: ZENCARD+@ :: $(hostname) ::" fi - # ADD G1ASTRO LINK + # ADD ASTROID LINK # OVERLAY LOGO over FOND (logo.png) composite -compose Over -dissolve 70% \