diff --git a/G1BILLETS.sh b/G1BILLETS.sh index b6e70ba..ab104c2 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 + G1PASS +# Create different king of G1BILLET(s) with $MONTANT DU or TW IPNS + G1CARD # ${MY_PATH}/G1BILLETS.sh 5 ticket 2 # MONTANT # STYLE # SECURITE ################################################################################ MONTANT="$1" @@ -39,10 +39,10 @@ if [[ $MONTANT != "daemon" ]]; then echo "G1BILLET FACTORY MONTANT=$MONTANT DICE=$DICE" echo "$STYLE : $MY_PATH/${IMAGES}/$STYLE" - ## CHECK IF STYLE IS EMAIL => G1PASS+@ IPFS G1BILLET + ## CHECK IF STYLE IS EMAIL => G1CARD+@ IPFS G1BILLET if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then - echo "ASTROPORT $STYLE :: G1PASS+@" + echo "ASTROPORT $STYLE :: G1CARD+@" # echo "PLAYER : $STYLE" EMAIL=${STYLE} DICE=5 @@ -64,7 +64,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 G1PASS + ## THIS IS THE PASS for G1CARD 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) @@ -172,11 +172,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 @@ -260,8 +260,8 @@ function countdown() { echo "==================================================" echo "G1BILLET x 6 : $HNAME:33101" echo "G1BILLET+ x 6 : $HNAME:33101/?montant=0&style=_&dice=4" - echo "G1PASS : $HNAME:33101/?montant=10&style=saubole" - echo "G1PASS+TW : $HNAME:33101/?montant=0&style=astro${RANDOM}@yopmail.com" + echo "G1CARD : $HNAME:33101/?montant=10&style=saubole" + echo "G1CARD+TW : $HNAME:33101/?montant=0&style=astro${RANDOM}@yopmail.com" echo "==================================================" echo "LOG : tail -f ${MY_PATH}/tmp/G1BILLETS.log" echo "=================================================="