From 1f69d2d9c4d5df00363ca078ab1931fe3dc23e1b Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 19 Apr 2023 04:10:17 +0200 Subject: [PATCH] make it better --- API/SALT.sh | 11 ++++++----- speak.sh | 1 + tools/VISA.print.sh | 35 ++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/API/SALT.sh b/API/SALT.sh index 55a64e1d..a1f7d5b2 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -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 "

$PLAYER LOGOUT OK

" > ~/.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}.* diff --git a/speak.sh b/speak.sh index 677c2a5e..d7f28450 100755 --- a/speak.sh +++ b/speak.sh @@ -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 diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 45a03a70..93af5540 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -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