From bb9b7bf0700e7f4be55ffc291c22bfaada7d5a69 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 14 Apr 2023 22:57:12 +0200 Subject: [PATCH] > ~/.zen/tmp/topgp cat ~/.zen/tmp/topgp --- API/QRCODE.sh | 2 +- ASTROBOT/G1Voeu.sh | 4 ++-- tools/VISA.new.sh | 4 ++-- tools/VISA.print.sh | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 3820deb0..4958b371 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -156,7 +156,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then cat ~/.zen/tmp/${MOATS}/disco >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} + echo "BLURP $PORT" # && rm -Rf ~/.zen/tmp/${MOATS} ) & exit 0 fi diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 8773dc61..4c8d61cc 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -97,8 +97,8 @@ mkdir -p ~/.zen/tmp/$MOATS USALT=$(echo "$SALT" | jq -Rr @uri) UPEPPER=$(echo "$PEPPER" | jq -Rr @uri) DISCO="/?salt=${USALT}&pepper=${UPEPPER}" - echo "${DISCO}" \ - | gpg --symmetric --armor --batch --passphrase "$SALT" -o ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc + echo "${DISCO}" > ~/.zen/tmp/topgp + cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$SALT" -o ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index e1db3bc2..301dbe12 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -205,8 +205,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" #~ echo "$secFromDunikey" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec ## PGP ENCODING SALT/PEPPER API ACCESS - echo "${DISCO}" \ - | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc + echo "${DISCO}" > ~/.zen/tmp/topgp + cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc #~ openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in ~/.zen/game/players/${PLAYER}/secret.june -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k "$PASS" #~ PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base64 -w 0 | jq -sRr '@uri' ) diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index e1213898..95a9825a 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -46,8 +46,8 @@ mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jp USALT=$(echo "$SALT" | jq -Rr @uri) UPEPPER=$(echo "$SECRET" | jq -Rr @uri) - echo "/?${s}=${USALT}&${p}=${UPEPPER}" \ - | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${BILLETNAME}.asc + echo "/?${s}=${USALT}&${p}=${UPEPPER}" > ~/.zen/tmp/topgp + cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${BILLETNAME}.asc DISCO="$(cat ~/.zen/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" echo "$DISCO" @@ -65,8 +65,8 @@ mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jp [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${BILLETNAME}.TW.png -#~ brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${BILLETNAME}.TW.png > ~/.zen/tmp/bill.bin 2>/dev/null -#~ sudo brother_ql_print ~/.zen/tmp/bill.bin $LP +brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${BILLETNAME}.TW.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 convert ${MY_PATH}/../images/astroport.jpg -resize 300 ~/.zen/tmp/ASTROPORT.png