ZENCARD/ASTROID :: ZEN=$(echo "($COINS - 1) * 10" | bc | cut -d '.' -f 1)

This commit is contained in:
fred 2023-11-16 18:07:55 +01:00
parent 830a11ee83
commit 96b5fd260d
17 changed files with 59 additions and 73 deletions

View File

@ -181,9 +181,9 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
######################## ~/.zen/game/pending/*/*_G1WHO+*.TX
if [[ ! -f ~/.zen/game/pending/*/*_${VAL}+*.TX ]]; then
# MAKE PAYMENT
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1CARD:${MOATS}' -m"
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTROID:${MOATS}' -m"
${MY_PATH}/../tools/timeout.sh -t 5 \
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1CARD:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "ASTROID:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
if [ $? == 0 ]; then
echo "SENT" > ${PENDING} ## _12345.sh run MONITOR checking CHAIN REJECTION
@ -396,7 +396,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch"
cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch > ~/.zen/tmp/${MOATS}/decoded
## G1CARD COULD BE UP TO 12 MONTH OLD
## ASTROID COULD BE UP TO 12 MONTH OLD
if [[ ! -s ~/.zen/tmp/${MOATS}/decoded ]]; then
for ((i = 1; i < 13; i++)); do
UPASS=$(date -d "$i months ago" +"%Y%m")
@ -696,7 +696,7 @@ fi
## TEST G1 TYPE ( should convert to ipfs )
ASTROTOIPFS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${QRCODE} 2>/dev/null)
[[ ! ${ASTROTOIPFS} ]] \
&& echo "INVALID QRCODE : ${QRCODE}" \
&& echo "${PORT} INVALID QRCODE : ${QRCODE}" \
&& (echo "$HTTPCORS ERROR - INVALID QRCODE : ${QRCODE}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
&& exit 1
################################################################################
@ -893,7 +893,7 @@ else
fi
## USE PLAYER API OR MOVE TO G1CARD PGP QRCODE
## USE PLAYER API OR MOVE TO ASTROID PGP QRCODE
###################################################################################################
# API TWO : ?qrcode=G1PUB&url=____&type=____

View File

@ -170,14 +170,14 @@ mkdir -p ~/.zen/tmp/${MOATS}/
${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
echo "Le code de votre G1CARD est ${PASS}, scannez-le sur La♥Box Ğ1Station (demo : https://astroport.copylaradio.com)" > ~/.zen/tmp/${MOATS}/intro.txt
echo "Le code de votre ASTROID est ${PASS}, scannez-le sur La♥Box Ğ1Station (demo : https://astroport.copylaradio.com)" > ~/.zen/tmp/${MOATS}/intro.txt
## EXECUTE LAST LINE
$(cat ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt | tail -n 1)
echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROFEED=$FEEDNS PASS=$PASS"
BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
mpack -a -s "La♥Box : G1CARD :+: TW :+: " -d ~/.zen/tmp/${MOATS}/intro.txt \
mpack -a -s "La♥Box : ASTROID :+: TW :+: " -d ~/.zen/tmp/${MOATS}/intro.txt \
~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ${PLAYER}
end=`date +%s`

View File

@ -161,7 +161,7 @@ UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ip
[[ ! ${UMAPNS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - UMAPNS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "UMAPNS : ${myIPFS}/ipns/${UMAPNS}"
### CREATE A G1VISA FOR PLAYER (NO TW EXISTS YET for EMAIL)
### CREATE A ZENCARD FOR PLAYER (NO TW EXISTS YET for EMAIL)
if [[ ! -f ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ]]; then
## CHECK IF TW EXISTS FOR THIS EMAIL ALREADY

View File

@ -33,7 +33,7 @@ g1pub=$(cat ~/.zen/game/players/$PLAYER/secret.dunikey | grep 'pub:' | cut -d '
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/gchange --render '.' 'carte.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Carte'
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/gchange --render '.' 'gchange.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Gchange'
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/gchange --render '.' 'g1visa.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'G1Visa'
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/gchange --render '.' 'g1visa.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'ZenCard'
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/gchange --render '.' 'MOA.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[moa]]'
GPS=$(cat ~/.zen/tmp/gchange/carte.json | jq -r .[].gps)

View File

@ -298,7 +298,7 @@ GET /?player=${PLAYER}&youtube=URLENCODED
check available "logo.png" in [./images](./images)
## ➤ UPLANET : Create Umap, G1Card & G1Visa for PLAYER (email)
## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email)
### ```/?uplanet=${PLAYER}&salt=${LAT}&pepper=${LON}&g1pub=${PASS}```
| Parameter | Type | Description |
@ -306,7 +306,7 @@ check available "logo.png" in [./images](./images)
| `uplanet` | `email` | **Required** Your EMAIL token |
| `salt` | `decimal` | **Required** LATITUDE with 2 decimals digits |
| `pepper` | `decimal` | **Required** LONGITUDE with 2 decimals digits |
| `g1pub` | `string` | **Facultative** choose Umap G1Card PASS |
| `g1pub` | `string` | **Facultative** choose Umap AstroID PASS |
Create à Umap key (LAT/LON), then a PLAYER TW with GPS as Umap IPNS reference
This API is used by OSM2IPFS code.
@ -315,17 +315,17 @@ DEMO : https://ipfs.copylaradio.com/ipns/copylaradio.com
### QRCODE (API SandBox)
```http
GET /?qrcode=${G1PUB} | ${ASTRONAUTENS} | ${PGP_G1CARD_STRING}
GET /?qrcode=${G1PUB} | ${ASTRONAUTENS} | ${PGP_ASTROID_STRING}
```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
| `qrcode` | `string` | **Required**. Your G1PUB or ASTRONAUTENS or PGP_G1CARD token |
| `qrcode` | `string` | **Required**. Your G1PUB or ASTRONAUTENS or PGP_ASTROID token |
> Look for details & extend as you like in [~/.zen/Astroport.ONE/API/QRCODE.sh](API/QRCODE.sh)
### CODE BEHAVIOUR. monitor && rewards || fork signal
* Is IPNS key & PLAYER is local ? Redirect to [make a G1CARD (security level 6)](http://g1billet.localhost:33101/?montant=0&style=xbian&dice=6)
* Is IPNS key & PLAYER is local ? Redirect to [make a ASTROID (security level 6)](http://g1billet.localhost:33101/?montant=0&style=xbian&dice=6)
* Is G1*? Redirect to G1WishApp / Export Tagged Tiddlers json from TW
@ -336,13 +336,13 @@ redirect to
[http://astroport.localhost:1234/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json](https://astroport.copylaradio.com/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json)
redirect to pure "tag=" result json
* Is G1PUB ... (FROM NEW G1CARD or empty G1BILLET)
* Is G1PUB ... (FROM NEW ASTROID or empty G1BILLET)
* If balance is "null" : Send 1 G1 (G1BILLET)
* if GChange+ account exists : send 10 G1
* if Cesium+ account exists : send 50 G1
* Is G1CARD
* Is ASTROID
* decode with PASS and make operation (same functions as SALT API are available)

View File

@ -83,9 +83,9 @@ if [[ $SALT != "" && PEPPER != "" ]]; then
AstroID=$(cat ~/.zen/tmp/${MOATS}/AstroID.json | jq -r .[]._canonical_uri)
HPass=$(cat ~/.zen/tmp/${MOATS}/AstroID.json | jq -r .[].HPASS)
echo "AstroID=$AstroID ($HPass)"
tiddlywiki --load ~/.zen/tmp/${MOATS}/TW/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'G1Visa.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'G1Visa'
G1Visa=$(cat ~/.zen/tmp/${MOATS}/G1Visa.json | jq -r .[]._canonical_uri)
echo "G1Visa=$G1Visa"
tiddlywiki --load ~/.zen/tmp/${MOATS}/TW/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'ZenCard.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'ZenCard'
ZenCard=$(cat ~/.zen/tmp/${MOATS}/ZenCard.json | jq -r .[]._canonical_uri)
echo "ZenCard=$ZenCard"
if [[ ${ASTROPORT} != "" && ${ASTROPORT} != "null" ]]; then
@ -273,7 +273,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
sed -i "s~_ASTRONAUTENS_~/ipns/${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
## AstroID G1CARD Update
## AstroID ASTROID Update
[[ ! ${AstroID} ]] && AstroID="/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i"
sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
@ -433,12 +433,12 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
convert -gravity northwest -pointsize 25 -fill black -draw "text 300,140 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/game/players/${PLAYER}/ID.png
# INSERTED IMAGE IPFS
# IASTRO=$(ipfs add -Hq ~/.zen/game/players/${PLAYER}/ID.png | tail -n 1) ## G1VISA PUBLIC / PRIVATE
IASTRO="/ipfs/$(ipfs add -Hq ~/.zen/tmp/${MOATS}/pseudo.png | tail -n 1)" ## G1VISA PUBLIC ONLY
# IASTRO=$(ipfs add -Hq ~/.zen/game/players/${PLAYER}/ID.png | tail -n 1) ## ZENCARD PUBLIC / PRIVATE
IASTRO="/ipfs/$(ipfs add -Hq ~/.zen/tmp/${MOATS}/pseudo.png | tail -n 1)" ## ZENCARD PUBLIC ONLY
## Update G1Visa
[[ ! $G1Visa ]] && G1Visa="/ipfs/bafybeidhghlcx3zdzdah2pzddhoicywmydintj4mosgtygr6f2dlfwmg7a"
sed -i "s~${G1Visa}~${IASTRO}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
## Update ZenCard
[[ ! $ZenCard ]] && ZenCard="/ipfs/bafybeidhghlcx3zdzdah2pzddhoicywmydintj4mosgtygr6f2dlfwmg7a"
sed -i "s~${ZenCard}~${IASTRO}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
echo
echo "♥ IPFS Ŋ1 TW INIT ♥"
@ -508,10 +508,10 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
echo "$(${MY_PATH}/../tools/face.sh cool)"
echo " 'Astronaute' $PSEUDO"
echo
echo "* G1Visa : Public Key and Wallet
${NID}/ipns/${ASTRONAUTENS}#G1Visa"
echo "* ZenCard : Public Key and Wallet
${NID}/ipns/${ASTRONAUTENS}#ZenCard"
echo " "
echo "* AstroID : G1Card with PASS : $PASS"
echo "* AstroID : AstroID with PASS : $PASS"
echo "${NID}/ipns/${ASTRONAUTENS}#AstroID"
echo
echo "* UMap : registration at ${LAT}, ${LON}
@ -538,11 +538,11 @@ echo $PSEUDO > ~/.zen/tmp/PSEUDO ## Return data to start.sh # DEPRECATED ?
echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROFEED=$FEEDNS PASS=$PASS"
### SEND AstroID and G1Visa to EMAIL
### SEND AstroID and ZenCard to EMAIL
(
echo "Print your G1Visa : Public key (and wallet address)" > ~/.zen/tmp/${MOATS}/intro.txt
echo "Print your ZenCard : Public key (and wallet address)" > ~/.zen/tmp/${MOATS}/intro.txt
echo "It is your personal TW address and secured messaging inbox on https://gchange.fr" >> ~/.zen/tmp/${MOATS}/intro.txt
mpack -a -s "UPlanet : G1Visa" -d ~/.zen/tmp/${MOATS}/intro.txt \
mpack -a -s "UPlanet : ZenCard" -d ~/.zen/tmp/${MOATS}/intro.txt \
~/.zen/tmp/${MOATS}/pseudo.png ${PLAYER}
echo "Print your AstroID : Private control key (secured by $PASS)" > ~/.zen/tmp/${MOATS}/intro.txt
echo "Use it to LOG in or out your TW and take control of your personal wallet on https://cesium.app" >> ~/.zen/tmp/${MOATS}/intro.txt

View File

@ -150,9 +150,9 @@ echo "#############################################"
echo "######### IMPRIMANTE & G1BILLET ##############"
echo "#############################################"
########### QRCODE : G1VISA / G1BILLET : PRINTER ##############
########### QRCODE : ZENCARD / G1BILLET : PRINTER ##############
if [[ $USER != 'xbian' ]]; then
echo "INSTALL PRINTER FOR G1BILLET G1CARD G1VISA ..."
echo "INSTALL PRINTER FOR G1BILLET ASTROID ZENCARD ..."
saisie="OK"
if [[ $saisie != "" ]]; then
## PRINT & FONTS

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>[Astroport] : G1Visa Application : _HOSTNAME_ :: _IPFSNODEID_ </title>
<title>[Astroport] : ZenCard Application : _HOSTNAME_ :: _IPFSNODEID_ </title>
<meta http-equiv="refresh" content="9999; url='http://127.0.0.1:12345'" />
<link rel="icon" type="image/png" href="http://127.0.0.1:8080/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/logo.png" />
<link rel="stylesheet" href="http://127.0.0.1:8080/ipfs/QmaCh8mywWfxkXF3JziFzqZS6yZFo3eNS5fSfnzJqdSQvX/decoration.css" type="text/css" />
@ -155,21 +155,7 @@ a:active{
<br>
<span><a href="https://pad.p2p.legal/s/Astroport.ONE">Astroport</a>.<a href="https://github.com/papiche/Astroport.ONE">ONE</a>
<br> - Crypto Commons Playground -</span>
<h2>
<form method='get' action='http://g1billet.localhost:33101' target='aframe'>
<input type='hidden' name='montant' value='0' >
<label for='type'>Type :</label>
<select name='type'>
<option value=''>G1BILLET+ ( x 6 )</option>
<option value='jeu' selected>G1CARD</option>
<option value='@astroport'>G1CARD+@</option>
</select>
<input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;
<button type='submit'>get more goodies...</button>
</form>
</h2>
<br>
<a href="https://opencollective.com/monnaie-libre/" target="funding">- (^‿‿^) -</a>
<br>

View File

@ -81,7 +81,7 @@ header {
<form id="formlink" action="http://127.0.0.1:1234" method="GET" enctype="application/x-www-form-urlencoded">
<h1><span>Astroport</span> <a href="http://127.0.0.1:12345">Ŋ1</a></h1>
<div id="yellow">
<h2>G1Card SECRETS</h2>
<h2>AstroID SECRETS</h2>
<input name='salt' value='0'>
<h3><a title="YOUR ASTRO PORT" href="http://127.0.0.1:12345"> >>> (◕‿‿◕) <<< </a></h3>
<input name='pepper' value='0'>
@ -119,7 +119,7 @@ header {
<a href="https://olympe.network">Olympe.Network</a><br>
Astroport.ONE est un logiciel libre développé sous licence AGPL v3
</center>
<a target="gchange" href="https://gchange.fr">Une fois votre G1CARD obtenu, direction https://gchange.fr !</a>
<a target="gchange" href="https://gchange.fr">Une fois votre ASTROID obtenu, direction https://gchange.fr !</a>
</h1>
</div>
</article>
@ -224,7 +224,7 @@ function testLatency(cb) {
function countdown() {
if (timeLeft == -1) {
clearTimeout(timerId);
document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu'>G1CARD</option><option value='@astroport'>G1CARD+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>Lancer Fabrication</button></form>";
document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu'>ASTROID</option><option value='@astroport'>ASTROID+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>Lancer Fabrication</button></form>";
} else {
// elem.innerHTML = timeLeft + " s";
timeLeft--;

File diff suppressed because one or more lines are too long

View File

@ -26,7 +26,7 @@ cat "${RSS}" | jq -r '.[] | .title' > ~/.zen/tmp/${MOATS}/titles.list
while read title; do
[[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title::5} == "Draft" ]] \
[[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
&& echo "FILTERED TITLE ${title}" && continue
## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW

View File

@ -40,7 +40,7 @@ if [[ ${SALT} == "" || ${PEPPER} == "" ]]; then
else
echo "VIRTUAL PLAYER ${PLAYER} WELCOME - CREATING G1Card"
echo "VIRTUAL PLAYER ${PLAYER} WELCOME - CREATING AstroID"
VIRTUAL=1
G1PUB=$(${MY_PATH}/keygen -t duniter "${SALT}" "${PEPPER}")
ASTRONAUTENS=$(${MY_PATH}/keygen -t ipfs "${SALT}" "${PEPPER}")
@ -93,23 +93,23 @@ convert -gravity NorthEast -pointsize 15 -fill black -draw "text 42,32 \"$PLAYER
convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/${MOATS}/image.png ~/.zen/tmp/${MOATS}/pseudo.png
convert -gravity SouthEast -pointsize 30 -fill black -draw "text 100, 72 \"${PASS}\"" ~/.zen/tmp/${MOATS}/pseudo.png ~/.zen/tmp/${MOATS}/pass.png
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,25 \"$SALT\"" ~/.zen/tmp/${MOATS}/pass.png ~/.zen/tmp/${MOATS}/salt.png
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg
## PRINT VISA
[[ $LP ]] \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \
&& sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP
## PRINT PGP G1Card
convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1Card.png -resize 400 ~/.zen/tmp/${MOATS}/ASTROPORT.png
## PRINT PGP AstroID
convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.AstroID.png -resize 400 ~/.zen/tmp/${MOATS}/ASTROPORT.png
convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/${MOATS}/ASTROPORT.png ~/.zen/tmp/${MOATS}/one.png
composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg
composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg
[[ $LP ]] \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/${PASS}.png > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \

View File

@ -29,7 +29,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)
############################################################ G1Voeu.sh use
############################################################ PRINT G1Milgram (once a month)
if [[ ${G1PUB} != "" && ${VoeuName} != "" && ${MOATS} != "" ]]; then
echo "MAKE G1CARD+@"
echo "MAKE ASTROID+@"
mkdir -p ~/.zen/tmp/${MOATS}
#################################################################
## MAKING SPECIAL amrzqr => G1Milgram TICKET = G1Missive
@ -83,7 +83,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)
cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png
## MAKE amzqr WITH @@@@@ PGP G1CARD FORMAT (%40)
## MAKE amzqr WITH @@@@@ PGP ASTROID FORMAT (%40)
amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.asc | tr '-' '@' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" \
-d "$HOME/.zen/tmp/${MOATS}" \
-l H \

View File

@ -33,7 +33,7 @@ if [[ ! -d $img_dir ]]; then
echo "+++ ${PLAYER} have $COINS Ğ1 Coins +++"
# CONVERT COINS to ZEN
ZEN=$(echo "$COINS * 10" | bc)
ZEN=$(echo "($COINS - 1) * 10" | bc | cut -d '.' -f 1)
## USE G1BARRE OR G1WorldMap.png AS 1ST IMAGE
#~ curl -m 3 -so ~/.zen/tmp/carousel/${pub}.one.png \

View File

@ -58,7 +58,7 @@ myAstroPath() {
#~ if [[ ! "$myAstroPlayersPage" ]]; then
#~ counter=1
#~ for tw in ls ~/.zen/game/players/*/ipfs/moa/index.html; do
#~ tiddlywiki --load $tw --output ~/.zen/tmp --render '.' "${counter}G1Visa.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'G1Visa'
#~ tiddlywiki --load $tw --output ~/.zen/tmp --render '.' "${counter}ZenCard.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'ZenCard'
#~ ((counter++))
#~ done

View File

@ -20,7 +20,7 @@ COMMENT="$2"
# ${MY_PATH}/jaklis/jaklis.py history -p $G1DEST -n 10 -j
# THIS SCRIPT IS LAUNCHED AFTER A PAYMENT IS DONE
# IT WILL VERIFY IN HISTORY "G1CARD:MOATS" APPEARING
# IT WILL VERIFY IN HISTORY "ASTROID:MOATS" APPEARING
# ELSE IT SENDS A MESSAGE TO PLAYER
## OR COULD TRY AGAIN