forked from qo-op/G1BILLET
This commit is contained in:
parent
55d69c0ecd
commit
441dc82943
|
@ -75,23 +75,22 @@ then
|
||||||
## IT IS AN ASTRONAUTENS IPNS LINK
|
## IT IS AN ASTRONAUTENS IPNS LINK
|
||||||
USALT=$(echo "$SALT" | jq -Rr @uri)
|
USALT=$(echo "$SALT" | jq -Rr @uri)
|
||||||
UPEPPER=$(echo "$SECRET" | jq -Rr @uri)
|
UPEPPER=$(echo "$SECRET" | jq -Rr @uri)
|
||||||
DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
echo "/?salt=${USALT}&pepper=${UPEPPER}" \
|
||||||
echo "${DISCO}" \
|
|
||||||
| gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
|
| gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
|
||||||
|
|
||||||
# qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
|
DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )"
|
||||||
|
echo "$DISCO"
|
||||||
## Add logo to QRCode
|
## Add logo to QRCode
|
||||||
cp ${MY_PATH}/images/astrologo_nb.png -resize ${MY_PATH}/tmp/fond.png
|
cp ${MY_PATH}/images/astrologo_nb.png ${MY_PATH}/tmp/fond.png
|
||||||
|
|
||||||
## MAKE amzqr WITH astro:// LINK
|
## MAKE amzqr WITH astro:// LINK
|
||||||
amzqr "$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr -d '\n')" \
|
amzqr -d ${MY_PATH}/tmp \
|
||||||
-d ${MY_PATH}/tmp \
|
|
||||||
-l H \
|
-l H \
|
||||||
-p ${MY_PATH}/tmp/fond.png
|
-p ${MY_PATH}/tmp/fond.png \
|
||||||
|
"$DISCO"
|
||||||
|
|
||||||
## ADD PLAYER EMAIL
|
## 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 -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"$EMAIL\"" ${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
|
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 \
|
composite -compose Over -gravity SouthWest -geometry +50+50 \
|
||||||
|
@ -101,6 +100,16 @@ then
|
||||||
|
|
||||||
rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
|
rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
|
||||||
|
|
||||||
|
if [[ ${STYLE} == "xbian" ]]; then
|
||||||
|
amzqr "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" -l H -p "$MY_PATH/images/moa_net.png" -c -n QRTWavatar.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/
|
||||||
|
convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 260 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png
|
||||||
|
composite -compose Over -gravity Center -geometry +40+40 \
|
||||||
|
"${MY_PATH}/tmp/g1billet/${UNIQID}/300.png" \
|
||||||
|
"${MY_PATH}/tmp/${BILLETNAME}.jpg" \
|
||||||
|
"${MY_PATH}/tmp/${BILLETNAME}.jpg"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ENTETE ET BAS DE BILLET
|
# ENTETE ET BAS DE BILLET
|
||||||
|
@ -141,7 +150,7 @@ convert -font 'Liberation-Sans' \
|
||||||
"${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
|
"${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
|
||||||
else
|
else
|
||||||
convert -font 'Liberation-Sans' \
|
convert -font 'Liberation-Sans' \
|
||||||
-pointsize 40 -fill black -draw 'text 50,60 "'"$XZUID"'"' \
|
-pointsize 40 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
|
||||||
-pointsize 20 -fill black -draw 'text 380,26 "'"${NOTERIB}"'"' \
|
-pointsize 20 -fill black -draw 'text 380,26 "'"${NOTERIB}"'"' \
|
||||||
-pointsize 30 -draw 'text 50,90 "'"Secret 1: $SALT"'"' \
|
-pointsize 30 -draw 'text 50,90 "'"Secret 1: $SALT"'"' \
|
||||||
-pointsize 30 -fill black -draw 'text 50,120 "'"Secret 2: $SECRET"'"' \
|
-pointsize 30 -fill black -draw 'text 50,120 "'"Secret 2: $SECRET"'"' \
|
||||||
|
@ -150,6 +159,6 @@ convert -font 'Liberation-Sans' \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
|
rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
|
||||||
## TODO STORE XZUID & G1PUB into ASTROPORT/IPFS, as FUTURE travelers...
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 68 KiB |
Binary file not shown.
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
After Width: | Height: | Size: 280 KiB |
Loading…
Reference in New Issue