From 103e7805e66128899292996ffaab0051cb6fe8c8 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 8 Apr 2023 15:48:14 +0200
Subject: [PATCH] Make G1PASS with new PASS & fuzzy s= p= / TW - official -
 HPASS /

---
 tools/VISA.print.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh
index f1bed368..e1213898 100755
--- a/tools/VISA.print.sh
+++ b/tools/VISA.print.sh
@@ -29,17 +29,24 @@ source ~/.zen/game/players/${PLAYER}/secret.june
 
 LP=$(ls /dev/usb/lp*)
 
+PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
+
 # USE G1BILLET GENERATOR
 [[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] \
 && echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "$PASS" "xbian" "$ASTRONAUTENS" "$PLAYER" \
 && ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "$PASS" "xbian" "$ASTRONAUTENS" "$PLAYER"
 
+s=$(${MY_PATH}/diceware.sh 1 | xargs)
+p=$(${MY_PATH}/diceware.sh 1 | xargs)
 BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
-[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg
+
+mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jpg
+
+[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/$PASS.jpg
 
         USALT=$(echo "$SALT" | jq -Rr @uri)
         UPEPPER=$(echo "$SECRET" | jq -Rr @uri)
-        echo "/?salt=${USALT}&pepper=${UPEPPER}" \
+        echo "/?${s}=${USALT}&${p}=${UPEPPER}" \
         | 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 )"
@@ -56,8 +63,6 @@ BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
         ## ADD PLAYER EMAIL
         convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"$EMAIL\"" ~/.zen/tmp/fond_qrcode.png ~/.zen/tmp/${BILLETNAME}.TW.png
 
-    #~ convert ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg -rotate -90 ~/.zen/tmp/G1BILLET.png
-
 [[ $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