diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 4958b371..8933edf5 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -119,11 +119,11 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco #################################### if [ $? == 0 ]; then - COINSFILE=$HOME/.zen/tmp/coucou/${VAL}.COINS + COINSFILE="$HOME/.zen/tmp/coucou/${G1PUB}.COINS" echo "ADJUSTING ${COINSFILE}" CUR=$(cat ${COINFILE}) [[ ${CUR} != "" && ${CUR} != "null" ]] \ - && echo $((CUR+WHAT)) > ${COINFILE} \ + && echo $((CUR-WHAT)) > ${COINFILE} \ || echo ${WHAT} > ${COINFILE} cat ${COINFILE} fi diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 95a9825a..45a03a70 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -45,11 +45,11 @@ 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 "$SECRET" | 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.${BILLETNAME}.asc + cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$PASS" -o ~/.zen/tmp/gpg.${PASS}.asc - DISCO="$(cat ~/.zen/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" + 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 @@ -61,11 +61,11 @@ mv ~/.zen/G1BILLET/tmp/g1billet/$PASS/$BILLETNAME.BILLET.jpg ~/.zen/tmp/$PASS.jp "$DISCO" ## 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 -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/${BILLETNAME}.TW.png +[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${PASS}.TW.png -brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${BILLETNAME}.TW.png > ~/.zen/tmp/bill.bin 2>/dev/null +brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${PASS}.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