G1BILLET v2.rc1
This commit is contained in:
parent
b9db92a90c
commit
abbc1bbe15
48
G1BILLETS.sh
48
G1BILLETS.sh
|
|
@ -18,12 +18,11 @@ ME="${0##*/}"
|
|||
# ${MY_PATH}/G1BILLETS.sh 5 ticket 2 # MONTANT # STYLE # SECURITE
|
||||
################################################################################
|
||||
MONTANT="$1"
|
||||
[[ $MONTANT == "0" ]] && MONTANT=""
|
||||
|
||||
### COMMAND MODE ###
|
||||
### COMMAND LINE MODE (DAEMON IS CALLING ITSELF) ###
|
||||
if [[ $MONTANT != "daemon" ]]; then
|
||||
|
||||
[[ $MONTANT == "" ]] && MONTANT="___"
|
||||
[[ $MONTANT == "" || $MONTANT == "0" ]] && MONTANT="___"
|
||||
|
||||
STYLE="$2"
|
||||
|
||||
|
|
@ -37,10 +36,10 @@ if [[ $MONTANT != "daemon" ]]; then
|
|||
echo "G1BILLET FACTORY MONTANT=$MONTANT DICE=$DICE"
|
||||
echo "$STYLE : $MY_PATH/${IMAGES}/$STYLE"
|
||||
|
||||
## CHECK IF STYLE IS EMAIL => astro IPFS G1BILLET
|
||||
## CHECK IF STYLE IS EMAIL => G1PASS+@ IPFS G1BILLET
|
||||
if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||
|
||||
echo "ASTROPORT $STYLE G1BILLET+ or G1TW"
|
||||
echo "ASTROPORT $STYLE :: G1PASS+@"
|
||||
# echo "PLAYER : $STYLE"
|
||||
EMAIL=${STYLE}
|
||||
DICE=5
|
||||
|
|
@ -49,16 +48,6 @@ if [[ $MONTANT != "daemon" ]]; then
|
|||
LASTX=$(ls -d ${MY_PATH}/${IMAGES}/x* | tail -n 1)
|
||||
STYLE="$(cat ${LASTX} | rev | cut -d '/' -f 1 | rev)"
|
||||
|
||||
## IS EMAIL LOCAL PLAYER ====> COPY / REFRESH STYLE
|
||||
[[ -d ~/.zen/game/players/${EMAIL} ]] \
|
||||
&& rm -Rf ${MY_PATH}/_images/${EMAIL} \
|
||||
&& mkdir -p ${MY_PATH}/_images/${EMAIL} \
|
||||
&& cp ${LASTX}/* ${MY_PATH}/_images/${EMAIL} \
|
||||
&& cp ~/.zen/game/players/${EMAIL}/fond.jpg ${MY_PATH}/_images/${EMAIL} 2>/dev/null \
|
||||
&& cp ~/.zen/game/players/${EMAIL}/g1.png ${MY_PATH}/_images/${EMAIL} 2>/dev/null \
|
||||
&& cp ~/.zen/game/players/${EMAIL}/logo.png ${MY_PATH}/_images/${EMAIL} 2>/dev/null \
|
||||
&& IMAGES="_images" && STYLE="${EMAIL}"
|
||||
|
||||
fi
|
||||
|
||||
## STYLE SELECTED: PDF DE 6 BILLETS OR SINGLE
|
||||
|
|
@ -103,7 +92,7 @@ if [[ $MONTANT != "daemon" ]]; then
|
|||
#######################################################################################################
|
||||
# CREATION FICHIER IMAGE BILLET dans ${MY_PATH}/tmp/g1billet/${UNIQID}
|
||||
#######################################################################################################
|
||||
echo ${MY_PATH}/MAKE_G1BILLET.sh "${SECRET1}" "${SECRET2}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONS}" "${EMAIL}"
|
||||
echo ${MY_PATH}/MAKE_G1BILLET.sh '"'${SECRET1}'"' '"'${SECRET2}'"' "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONS}" "${EMAIL}"
|
||||
${MY_PATH}/MAKE_G1BILLET.sh "${SECRET1}" "${SECRET2}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONS}" "${EMAIL}"
|
||||
#######################################################################################################
|
||||
#######################################################################################################
|
||||
|
|
@ -154,12 +143,13 @@ else
|
|||
[[ $pidportinuse ]] && echo "KILLING OLD DEAMON 33101 $pidportinuse" && kill -9 $pidportinuse && killall G1BILLETS.sh && exit 1
|
||||
|
||||
pidportinuse=$(lsof -i :33102 | tail -n 1 | awk '{print $2}')
|
||||
[[ $pidportinuse ]] && kill -9 $pidportinuse && echo "KILLING NOT COLLECTED THREAD $pidportinuse"
|
||||
[[ $pidportinuse ]] && kill $pidportinuse && echo "KILLING NOT COLLECTED THREAD $pidportinuse"
|
||||
#####################################################################
|
||||
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
isLAN=$(route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||
isBOX=$(cat ~/.zen/♥Box)
|
||||
|
||||
## WHERE DO CLIENT WILL GET FILE
|
||||
if [[ $isLAN ]]; then
|
||||
HNAME="http://g1billet.localhost"
|
||||
else
|
||||
|
|
@ -168,7 +158,6 @@ else
|
|||
[[ $isBOX ]] && HNAME="http://$isBOX"
|
||||
RNAME="$HNAME:33102"
|
||||
|
||||
|
||||
## AVAILABLE STYLES : CREATING SELECT
|
||||
sytle=($(find ${MY_PATH}/${IMAGES}/* -type d | sort | rev | cut -d '/' -f 1 | rev))
|
||||
sytlenb=${#sytle[@]}
|
||||
|
|
@ -178,13 +167,13 @@ else
|
|||
pre=${stname:0:1}
|
||||
|
||||
if [[ $pre == "_" ]]; then
|
||||
OPT="${OPT}<option value='_'>:: G1BILLET :: _ + :: </option>"
|
||||
elif [[ $(echo ${stname} | grep '@') ]]; then
|
||||
OPT="${OPT}" ## HIDDEN DEV
|
||||
OPT="${OPT}<option value='_'>:: G1BILLET :: (+) ::</option>"
|
||||
elif [[ $pre == "x" ]]; then
|
||||
OPT="${OPT}<option value='${stname}'>:: G1TW :: ${stname} :: </option>"
|
||||
OPT="${OPT}<option value='${stname}'>:: G1PASS+TW :: ${stname} ::</option>"
|
||||
elif [[ $(echo ${stname} | grep '@') ]]; then
|
||||
OPT="${OPT}<option value='${stname}'>:: G1PASS+@ :: ${stname} :DEV:</option>"
|
||||
else
|
||||
OPT="${OPT}<option value='${stname}'>:: G1PASS :: ${stname} :: ~</option>"
|
||||
OPT="${OPT}<option value='${stname}'>:: G1PASS :: ${stname} ::</option>"
|
||||
fi
|
||||
|
||||
done
|
||||
|
|
@ -246,12 +235,12 @@ function countdown() {
|
|||
'${OPT}'
|
||||
</select>
|
||||
|
||||
<label for="dice">Securite :</label>
|
||||
<label for="dice">Dice :</label>
|
||||
<select name="dice">
|
||||
<option value="1">1</option>
|
||||
<option value="2">2</option>
|
||||
<option value="3" selected>3</option>
|
||||
<option value="4">4</option>
|
||||
<option value="3">3</option>
|
||||
<option value="4" selected>4</option>
|
||||
<option value="5">5</option>
|
||||
<option value="6">6</option>
|
||||
<option value="7">7</option>
|
||||
|
|
@ -266,9 +255,10 @@ function countdown() {
|
|||
|
||||
#### LOG REDIRECTION
|
||||
echo "=================================================="
|
||||
echo "PLANCHE : $HNAME:33101"
|
||||
echo "TICKET : $HNAME:33101/?montant=10&style=ticket"
|
||||
echo "ASTRO TW : $HNAME:33101/?montant=0&style=astro${RANDOM}@yopmail.com"
|
||||
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 "=================================================="
|
||||
echo "LOG : tail -f ${MY_PATH}/tmp/G1BILLETS.log"
|
||||
echo "=================================================="
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ exec 2>&1 >> ~/.zen/G1BILLET/tmp/G1BILLETS.log
|
|||
&& IMAGES="_images" \
|
||||
|| IMAGES="images"
|
||||
|
||||
echo "$ME ~~~~~~~~~~~~~~~ @@@@@@ -------"
|
||||
SECRET1="$1"
|
||||
echo SECRET1=${SECRET1}
|
||||
SECRET2="$2"
|
||||
|
|
@ -88,7 +89,7 @@ XZUID="__________@__________"
|
|||
|
||||
## PGP @PASS QRCODE
|
||||
## NOT G1BILLET v1 : Create EXTRA PGP QR
|
||||
if [[ "${STYLE:0:1}" != "_" ]]; then
|
||||
if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||
|
||||
USALT=$(echo "${SECRET1}" | jq -Rr @uri)
|
||||
UPEPPER=$(echo "$SECRET2" | jq -Rr @uri)
|
||||
|
|
@ -147,38 +148,46 @@ fi
|
|||
|
||||
[[ "${STYLE:0:1}" == "x" ]] \
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1PASS+ :: $(hostname) ::"
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1PASS+TW :: $(hostname) ::"
|
||||
|
||||
########################## G1Voeu _ G1BILLET linking TEST ## DEV
|
||||
#~ ## Astroport.ONE THERE :: STYLE=EMAIL :: G1BILLET+
|
||||
#~ if [[ -s ~/.zen/Astroport.ONE/tools/VOEUX.print.sh && "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||
#~ # CREATE @PASS (Connect G1BILLET+ TO current PLAYER)
|
||||
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 :: G1PASS+@
|
||||
# CREATE @PASS (G1G1BILLET+ G1Voeu derivated keys)
|
||||
|
||||
#~ MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
#~ SRCMAIL=$(cat ~/.zen/game/players/.current/.player 2>/dev/null)
|
||||
#~ G1PUB=$(cat ~/.zen/game/players/.current/.g1pub 2>/dev/null)
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
SRCMAIL=$(cat ~/.zen/game/players/.current/.player 2>/dev/null)
|
||||
G1PUB=$(cat ~/.zen/game/players/.current/.g1pub 2>/dev/null)
|
||||
|
||||
#~ ## GET current PLAYER G1PUB
|
||||
#~ [[ -d ~/.zen/game/players/${STYLE} ]] \
|
||||
#~ && SRCMAIL=${STYLE} && G1PUB=$(cat ~/.zen/game/players/${STYLE}/.g1pub 2>/dev/null)
|
||||
|
||||
#~ BILLETFULLNAME=$(echo "${SRCMAIL} ${SECRET1} ${SECRET2}" | sed 's/ /_/g') # EMAIL_dice_words
|
||||
BILLETFULLNAME=$(echo "${SRCMAIL} ${SECRET1} ${SECRET2}" | sed 's/ /_/g') # EMAIL_dice_words
|
||||
|
||||
#~ #### VOEUX.print.sh G1BILLET+
|
||||
#~ echo ~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}"
|
||||
#~ NEWIMAGIC=$(~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}" | tail -n 1)
|
||||
#~ convert ~/.zen/tmp/${MOATS}/START.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png
|
||||
#### VOEUX.print.sh G1BILLET+
|
||||
echo ~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}"
|
||||
NEWIMAGIC=$(~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}" | tail -n 1)
|
||||
convert ~/.zen/tmp/${MOATS}/START.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png
|
||||
|
||||
#~ ## MODIFY fond with "moa" ( TODO : Extract from TAG = moa + G1Voeu )
|
||||
#~ [[ -s ~/.zen/game/players/${SRCMAIL}/moa.jpg ]] \
|
||||
#~ && convert ~/.zen/game/players/${SRCMAIL}/moa.jpg -resize 964x459 -background grey -gravity center -extent 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg
|
||||
## GET moa.jpg From current PLAYER TW
|
||||
[[ -s ~/.zen/game/players/${SRCMAIL}/moa.jpg ]] \
|
||||
&& convert ~/.zen/game/players/${SRCMAIL}/moa.jpg -resize 964x459 -background grey -gravity center -extent 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg
|
||||
|
||||
#~ fi
|
||||
mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png
|
||||
|
||||
#SIGN & HIDE SECRETS
|
||||
XZUID=${SRCMAIL}
|
||||
SECRET1="G1PASS+@"
|
||||
SECRET2="Scan : https://astroport.com/@pass"
|
||||
BOTTOM="$(date) :: ♥Box :: G1PASS+@ :: $(hostname) ::"
|
||||
|
||||
fi
|
||||
|
||||
# ADD G1ASTRO LINK
|
||||
|
||||
# OVERLAY LOGO over FOND (logo.png)
|
||||
composite -compose Over -dissolve 60% \
|
||||
composite -compose Over -dissolve 70% \
|
||||
"${MY_PATH}/${IMAGES}/${STYLE}/logo.png" \
|
||||
"${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg" \
|
||||
"${MY_PATH}/tmp/${BILLETNAME}.jpg"
|
||||
|
|
@ -201,8 +210,8 @@ else
|
|||
convert -font 'Liberation-Sans' \
|
||||
-pointsize 35 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
|
||||
-pointsize 22 -fill black -draw 'text 340,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 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \
|
||||
-pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \
|
||||
-pointsize 25 -fill white -draw 'text 50,440 "'"$BOTTOM"'"' \
|
||||
"${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
|
||||
fi
|
||||
|
|
@ -232,12 +241,13 @@ composite -compose Over -gravity SouthEast -geometry +35+50 \
|
|||
"${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
|
||||
|
||||
# Add g1.png SIGLE
|
||||
[[ "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] && \
|
||||
composite -compose Over -dissolve 90% \
|
||||
"${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" \
|
||||
"${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
|
||||
"${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
|
||||
|
||||
|
||||
echo "$ME ~~~~~~~~~~~~~~~ @@@@@@ -------"
|
||||
|
||||
## BILLET READY in ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 147 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 97 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 142 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 87 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 104 KiB |
Loading…
Reference in New Issue