make it better

This commit is contained in:
fred 2023-04-19 04:10:17 +02:00
parent 505df45d61
commit 1f69d2d9c4
3 changed files with 25 additions and 22 deletions

View File

@ -458,7 +458,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
## SET COOKIE
USALT=$(echo "$SALT" | jq -Rr @uri)
UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
echo "/?salt=${USALT}&pepper=${UPEPPER}"
echo "/?salt=${USALT}&pepper=${UPEPPER} IS LOGIN - OPEN TW -"
sed "s~_TWLINK_~${REPLACE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/coucou/${MOATS}.index.redirect
sed -i "s~_USALT_~${USALT}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
sed -i "s~_UPEPPER_~${UPEPPER}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
@ -480,11 +480,12 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
## REMOVE PLAYER IPNS KEY FROM STATION
PLAYER=${WHAT}
ipfs key rm ${G1PUB}
ipfs key rm ${PLAYER}
REP="$PLAYER LOGOUT OK"
echo "<h1>$PLAYER LOGOUT OK</h1>" > ~/.zen/tmp/coucou/${MOATS}.log
echo "$HTTPCORS ${REP}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
ipfs key rm ${G1PUB} >> ~/.zen/tmp/coucou/${MOATS}.log
ipfs key rm ${PLAYER} >> ~/.zen/tmp/coucou/${MOATS}.log
echo "$HTTPCORS $(cat ~/.zen/tmp/coucou/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
end=`date +%s`
echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds.
rm ~/.zen/tmp/coucou/${MOATS}.*

View File

@ -9,6 +9,7 @@ if [[ $1 == "OFF" ]]; then
espeak "SHUT UP NOW"
[[ ! $PROG == "$HOME/.local/bin/espeak" ]] \
&& mkdir -p $HOME/.local/bin \
&& echo '#!/bin/bash' > $HOME/.local/bin/espeak \
&& chmod +x $HOME/.local/bin/espeak

View File

@ -44,28 +44,29 @@ mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jp
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/$PASS.jpg
USALT=$(echo "$SALT" | jq -Rr @uri)
UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
echo "/?${s}=${USALT}&${p}=${UPEPPER}" > ~/.zen/tmp/topgp
cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${PASS}.asc
#~ USALT=$(echo "$SALT" | jq -Rr @uri)
#~ UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
#~ echo "/?${s}=${USALT}&${p}=${UPEPPER}" > ~/.zen/tmp/topgp
#~ cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${PASS}.asc
DISCO="$(cat ~/.zen/tmp/gpg.${PASS}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )"
echo "$DISCO"
## Add logo to QRCode
cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/fond.png
#~ DISCO="$(cat ~/.zen/tmp/gpg.${PASS}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )"
#~ echo "$DISCO"
#~ ## Add logo to QRCode
#~ cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/fond.png
## MAKE amzqr WITH astro:// LINK
amzqr -d ~/.zen/tmp \
-l H \
-p ~/.zen/tmp/fond.png \
"$DISCO"
#~ ## MAKE amzqr WITH astro:// LINK
#~ amzqr -d ~/.zen/tmp \
#~ -l H \
#~ -p ~/.zen/tmp/fond.png \
#~ "$DISCO"
## ADD PLAYER EMAIL
convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"$EMAIL\"" ~/.zen/tmp/fond_qrcode.png ~/.zen/tmp/${PASS}.TW.png
#~ ## ADD PLAYER EMAIL
#~ convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"$EMAIL\"" ~/.zen/tmp/fond_qrcode.png ~/.zen/tmp/${PASS}.TW.png
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${PASS}.TW.png
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/G1BILLET/tmp/fond_qrcode.png
brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${PASS}.TW.png > ~/.zen/tmp/bill.bin 2>/dev/null
brother_ql_create --model QL-700 --label-size 62 ~/.zen/G1BILLET/tmp/fond_qrcode.png > ~/.zen/tmp/bill.bin 2>/dev/null
sudo brother_ql_print ~/.zen/tmp/bill.bin $LP
convert ~/.zen/game/players/${PLAYER}/QRG1avatar.png -resize 300 ~/.zen/tmp/QR.png