diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 268f11a..b23f7c7 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -37,7 +37,7 @@ DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS ## STYLE SELECTED: PDF DE 6 BILLETS OR SINGLE NBbillets=6 -[[ "${STYLE}" != "" && "${STYLE}" != "solian" && "${STYLE}" != "jeu" ]] && NBbillets=1 +[[ "${STYLE}" != "" ]] && NBbillets=1 echo "CREATION $NBbillets x G1BILLET - $STYLE - " @@ -196,7 +196,7 @@ function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } ##################################################################### while true; do echo "==================================================" - echo "$ME DAEMON READY" + echo "$ME DAEMON READY $(date)" echo "==================================================" echo "LOG : ON" echo "==================================================" diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 92d7d24..38bd27b 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -83,7 +83,7 @@ then # qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" ## Add logo to QRCode - convert ${MY_PATH}/images/astrologo_nb.png -resize 300 ${MY_PATH}/tmp/fond.png + cp ${MY_PATH}/images/astrologo_nb.png -resize ${MY_PATH}/tmp/fond.png ## MAKE amzqr WITH astro:// LINK amzqr "$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr -d '\n')" \ @@ -93,6 +93,7 @@ then ## ADD PLAYER EMAIL convert -gravity northwest -pointsize 28 -fill black -draw "text 5,5 \"$PLAYER\"" ${MY_PATH}/tmp/fond_qrcode.png ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png + convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png composite -compose Over -gravity SouthWest -geometry +50+50 \ "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" \ diff --git a/images/astrologo_nb.png b/images/astrologo_nb.png new file mode 100644 index 0000000..17c0e22 Binary files /dev/null and b/images/astrologo_nb.png differ