diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index e3bd404..2e38b12 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -12,7 +12,7 @@ ME="${0##*/}"
[[ -d ${MY_PATH}/_images/_/ ]] \
&& IMAGES="_images" \
|| IMAGES="images"
-echo "USING ${IMAGES} STYLES"
+
################################################################################
# Create different king of G1BILLET(s) with $MONTANT DU or TW IPNS + G1PASS
@@ -33,19 +33,21 @@ if [[ $MONTANT != "daemon" ]]; then
[[ $DICE != ?(-)+([0-9]) ]] && DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS
[[ $DICE != ?(-)+([0-9]) ]] && DICE=4
- echo "SECRETS : $DICE WORDS"
+ echo "G1BILLET FACTORY MONTANT=$MONTANT DICE=$DICE"
+ echo "$STYLE : $MY_PATH/${IMAGES}/$STYLE"
## CHECK IF STYLE IS EMAIL => astro IPFS G1BILLET
if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
echo "ASTROPORT $STYLE DEDICACE G1PASS"
# echo "PLAYER : $STYLE"
EMAIL=${STYLE}
- STYLE="xbian"
+ STYLE="$(ls -d ${MY_PATH}/${IMAGES}/xbian* | tail -n 1 | rev | cut -d '/' -f 1 | rev)"
fi
## STYLE SELECTED: PDF DE 6 BILLETS OR SINGLE
NBbillets=6
- [[ "${STYLE}" != "" ]] && NBbillets=1
+ [[ "${STYLE:0:1}" != "_" ]] && NBbillets=1 && MONTANT="___"
+ [[ ${STYLE} == "" ]] && NBbillets=6
echo "CREATION $NBbillets x G1BILLET - $STYLE - "
@@ -53,13 +55,13 @@ if [[ $MONTANT != "daemon" ]]; then
[[ ${STYLE} == "" ]] && STYLE="_"
# CHECK IF $STYLE IMAGES EXIST
- [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/g1.png ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/g1.png" && echo $ERROR && exit 1
- [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/fond.jpg" && echo $ERROR && exit 1
- [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/logo.png ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/logo.png" && echo $ERROR && exit 1
+ [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/g1.png ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/g1.png - EXIT" && echo $ERROR && exit 1
+ [[ ! -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
UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
- [ $DICE -gt 4 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${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)
# CREATION DE $NBbillets BILLETS DE $MONTANT DU
@@ -108,7 +110,7 @@ if [[ $MONTANT != "daemon" ]]; then
# MONTAGE DES IMAGES DES BILLETS VERS ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf
montage ${MY_PATH}/tmp/g1billet/${UNIQID}/*.jpg -tile 2x3 -geometry 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf
# NB!! if "not autorized" then edit /etc/ImageMagick-6/policy.xml and comment
- [[ ! -s ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf ]] && echo "Please Correct PDF policy /etc/ImageMagick-6/policy.xml " && exit 1
+ [[ ! -s ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf ]] && echo "ERROR PDF NOT FOUND - contact - support@qo-op.com" && exit 1
#
# CLEANING TEMP FILES
rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID}
@@ -166,11 +168,11 @@ else
pre=${stname:0:1}
if [[ $pre == "_" ]]; then
- OPT="${OPT}"
+ OPT="${OPT}"
elif [[ $pre == "x" ]]; then
- OPT="${OPT}"
+ OPT="${OPT}"
else
- OPT="${OPT}"
+ OPT="${OPT}"
fi
done
@@ -209,12 +211,13 @@ function countdown() {
}
}
+
+