push
This commit is contained in:
parent
abbc1bbe15
commit
b6daea1669
13
G1BILLETS.sh
13
G1BILLETS.sh
|
|
@ -28,6 +28,9 @@ if [[ $MONTANT != "daemon" ]]; then
|
|||
|
||||
DICE="$3"
|
||||
|
||||
SECRET1="$4"
|
||||
SECRET2="$5"
|
||||
|
||||
[[ $MONTANT != "___" ]] && DICE=3 ## Planche G1BILLET avec MONTANT securité 3
|
||||
|
||||
[[ $DICE != ?(-)+([0-9]) ]] && DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS
|
||||
|
|
@ -74,17 +77,17 @@ if [[ $MONTANT != "daemon" ]]; then
|
|||
mkdir -p "${MY_PATH}/tmp/g1billet/${UNIQID}"
|
||||
|
||||
## ADAPT SECURITY LEVEL
|
||||
SECRET1=$(${MY_PATH}/diceware.sh $DICE | xargs)
|
||||
SECRET2=$(${MY_PATH}/diceware.sh $DICE | xargs)
|
||||
echo "$SECRET1" "$SECRET2"
|
||||
[[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1=$(${MY_PATH}/diceware.sh $DICE | xargs)
|
||||
[[ ${SECRET2} == "" || $boucle -gt 1 ]] && SECRET2=$(${MY_PATH}/diceware.sh $DICE | xargs)
|
||||
echo "${SECRET1}" "${SECRET2}"
|
||||
# CREATION CLEF BILLET
|
||||
BILLETPUBKEY=$(python3 ${MY_PATH}/key_create_dunikey.py "$SECRET1" "$SECRET2")
|
||||
BILLETPUBKEY=$(python3 ${MY_PATH}/key_create_dunikey.py "${SECRET1}" "${SECRET2}")
|
||||
rm -f /tmp/secret.dunikey
|
||||
echo "$boucle : $BILLETPUBKEY "
|
||||
|
||||
if [[ $DICE -ge 4 || "${STYLE:0:1}" != "_" ]]; then
|
||||
# + ASTRONS ## G1BILLET APP STICKER
|
||||
${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SECRET1" "$SECRET2"
|
||||
${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "${SECRET1}" "${SECRET2}"
|
||||
ASTRONS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key)
|
||||
rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key
|
||||
ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONS"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
TAB=(${SECRET1} $SECRET2)
|
||||
TAB=(${SECRET1} ${SECRET2})
|
||||
FULLDICE=${#TAB[@]}
|
||||
|
||||
mkdir -p ${MY_PATH}/tmp/g1billet/$UNIQID
|
||||
|
|
@ -122,14 +122,30 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
|
|||
|
||||
fi
|
||||
|
||||
## TW moa net
|
||||
TWIMG="moa_net.png"
|
||||
|
||||
# G1PASS+@ linked to G1BIILET ipns
|
||||
[[ "${STYLE:0:1}" == "@" ]] \
|
||||
&& TWIMG="pirate_map.png"
|
||||
|
||||
## G1BILLET+ linked to .current PLAYER TW
|
||||
[[ "${STYLE:0:1}" == "_" ]] \
|
||||
&& ASTRONS=$(cat ~/.zen/game/players/.current/.playerns) \
|
||||
&& TWIMG="web_internet.png"
|
||||
|
||||
if [[ ${ASTRONS} != "" ]] ; then
|
||||
|
||||
amzqr "https://ipfs.copylaradio.com/ipns/${ASTRONS}" \
|
||||
-l H -p "$MY_PATH/${IMAGES}/moa_net.png" \
|
||||
-l H -p "$MY_PATH/${IMAGES}/${TWIMG}" \
|
||||
-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}/TW.png
|
||||
convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 260 ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png
|
||||
|
||||
else
|
||||
|
||||
ASTRONS="vide"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -139,15 +155,15 @@ fi
|
|||
|
||||
# GIBILLET dice > 3 => G1BILLET+
|
||||
[[ "${STYLE:0:1}" == "_" && ${FULLDICE} -gt 6 && ${MONTANT} == "___" ]] \
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1BILLET+ :: $(hostname) ::" && XZUID="G1BILLET +"
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1BILLET+ :: $(hostname) ::" && XZUID="G1BILLET+"
|
||||
|
||||
[[ "${STYLE:0:1}" != "_" ]] \
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1PASS :: $(hostname) ::"
|
||||
|
||||
[[ "${STYLE:0:1}" == "x" ]] \
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \
|
||||
&& mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \
|
||||
&& BOTTOM="$(date) :: ♥Box :: G1PASS+TW :: $(hostname) ::"
|
||||
|
||||
if [[ "${STYLE:0:1}" == "@" || "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] ; then
|
||||
|
|
@ -174,7 +190,7 @@ fi
|
|||
[[ -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
|
||||
|
||||
mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png
|
||||
mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png
|
||||
|
||||
#SIGN & HIDE SECRETS
|
||||
XZUID=${SRCMAIL}
|
||||
|
|
@ -192,9 +208,6 @@ composite -compose Over -dissolve 70% \
|
|||
"${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg" \
|
||||
"${MY_PATH}/tmp/${BILLETNAME}.jpg"
|
||||
|
||||
## NOT TO BE IN FINAL PDF (getting all jpg)
|
||||
rm "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
|
||||
### TEXT OVERLAY
|
||||
#~ -pointsize 22 -draw 'text 50,100 "'"Secret 1: ${SECRET1}"'"' \
|
||||
#~ -pointsize 22 -fill black -draw 'text 50,130 "'"Secret 2: $SECRET2"'"' \
|
||||
|
|
@ -250,6 +263,8 @@ composite -compose Over -dissolve 90% \
|
|||
echo "$ME ~~~~~~~~~~~~~~~ @@@@@@ -------"
|
||||
|
||||
## BILLET READY in ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg
|
||||
## NOT TO BE IN FINAL PDF (getting all jpg)
|
||||
rm "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue