diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index 7147baf..a762193 100755
--- a/G1BILLETS.sh
+++ b/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}"
- elif [[ $(echo ${stname} | grep '@') ]]; then
- OPT="${OPT}" ## HIDDEN DEV
+ OPT="${OPT}"
elif [[ $pre == "x" ]]; then
- OPT="${OPT}"
+ OPT="${OPT}"
+ elif [[ $(echo ${stname} | grep '@') ]]; then
+ OPT="${OPT}"
else
- OPT="${OPT}"
+ OPT="${OPT}"
fi
done
@@ -246,12 +235,12 @@ function countdown() {
'${OPT}'
-
+