diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index ff14461a..1abd0df0 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -119,10 +119,10 @@ fi #~ echo "Inscription..." -[[ $SALT == "" ]] && SALT=$(${MY_PATH}/diceware.sh 4 | xargs) +[[ $SALT == "" ]] && SALT=$(${MY_PATH}/../tools/diceware.sh 4 | xargs) #~ echo "-> ID : $SALT" -[[ $PEPPER == "" ]] && PEPPER=$(${MY_PATH}/diceware.sh 2 | xargs) +[[ $PEPPER == "" ]] && PEPPER=$(${MY_PATH}/../tools/diceware.sh 2 | xargs) #~ echo "-> PASS : $PEPPER" PSEUDO=${PLAYER%%[0-9]*} @@ -133,7 +133,7 @@ PSEUDO=${PLAYER%%[0-9]*} [[ $(ls ~/.zen/game/players/$PSEUDO 2>/dev/null) ]] && echo "$PSEUDO EST DEJA UN PLAYER. EXIT" && exit 1 # PSEUDO=${PSEUDO,,} #lowercase -[[ ! ${PLAYER} ]] && PLAYER=${PSEUDO}${RANDOM:0:3}@$(${MY_PATH}/diceware.sh 1 | xargs).${RANDOM:0:3} \ +[[ ! ${PLAYER} ]] && PLAYER=${PSEUDO}${RANDOM:0:3}@$(${MY_PATH}/../tools/diceware.sh 1 | xargs).${RANDOM:0:3} \ && echo "ADRESSE EMAIL ?" && read OPLAYER && [[ $OPLAYER ]] && PLAYER=$OPLAYER PLAYER=${PLAYER,,} @@ -530,8 +530,8 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" #~ U Planet : ${myUPLANET} #~ Astroport.ONE ★ PKI ★ Ğ1/Ŋ1 ★ DAO ★ Libre ★"; # sleep 1 -echo "$(${MY_PATH}/../tools/face.sh friendly) ★ GCHANGE LIBRE MARKET ★" -echo "Use $SALT and $PEPPER to register on https://cesium.app and https://gchange.fr to ★ friends" +#~ echo "$(${MY_PATH}/../tools/face.sh friendly) ★ GCHANGE LIBRE MARKET ★" +#~ echo "Use $SALT and $PEPPER to register on https://cesium.app and https://gchange.fr to ★ friends" echo "" echo $PSEUDO > ~/.zen/tmp/PSEUDO ## Return data to start.sh # DEPRECATED ? @@ -541,11 +541,11 @@ echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROF ### SEND AstroID and ZenCard to EMAIL ( 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 +echo "It is your personal ZenCard. Use it to receive Zen." >> ~/.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 +echo "Use it to send Zen to other Uplanet players https://qo-op.com" >> ~/.zen/tmp/${MOATS}/intro.txt mpack -a -s "UPlanet : AstroID" -d ~/.zen/tmp/${MOATS}/intro.txt \ $HOME/.zen/game/players/${PLAYER}/AstroID.png ${PLAYER} diff --git a/command.sh b/command.sh index 3d832e56..6a90d4b6 100755 --- a/command.sh +++ b/command.sh @@ -36,12 +36,12 @@ echo 'PRESS ENTER... '; read ## CREATE AND OR CONNECT USER PS3='Astronaute connectez votre PLAYER ___ ' - players=( "PRINT G1CARTE" "CREATE PLAYER" "IMPORT PLAYER" $(ls ~/.zen/game/players | grep "@" 2>/dev/null)) + players=( "ZENCARD DEMO" "CREATE PLAYER" "IMPORT PLAYER" $(ls ~/.zen/game/players | grep "@" 2>/dev/null)) ## MULTIPLAYER select fav in "${players[@]}"; do case $fav in - "PRINT G1CARTE") + "ZENCARD DEMO") ## DIRECT VISA.print.sh echo "'Email ?'" read EMAIL diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 032365ff..2a6b0061 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -57,7 +57,7 @@ fi LP=$(ls /dev/usb/lp* | head -n 1 2>/dev/null) -[[ ${PASS} == "" ]] && PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) +[[ ${PASS} == "" ]] && PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5) # USE G1BILLET GENERATOR [[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] \ @@ -89,11 +89,11 @@ composite -compose Over -gravity NorthEast -geometry +42+72 ~/.zen/tmp/${MOATS}/ composite -compose Over -gravity NorthWest -geometry +0+12 ~/.zen/tmp/${MOATS}/QR.png ~/.zen/tmp/${MOATS}/one.png ~/.zen/tmp/${MOATS}/astroport.png # composite -compose Over -gravity NorthWest -geometry +280+280 ~/.zen/game/players/${PLAYER}/QRsec.png ~/.zen/tmp/${MOATS}/one.png ~/.zen/tmp/${MOATS}/image.png -convert -gravity NorthEast -pointsize 15 -fill black -draw "text 42,32 \"$PLAYER\"" ~/.zen/tmp/${MOATS}/astroport.png ~/.zen/tmp/${MOATS}/image.png -convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/${MOATS}/image.png ~/.zen/tmp/${MOATS}/pseudo.png +convert -gravity NorthEast -pointsize 18 -fill black -draw "text 42,32 \"$PLAYER\"" ~/.zen/tmp/${MOATS}/astroport.png ~/.zen/tmp/${MOATS}/image.png +convert -gravity NorthWest -pointsize 18 -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}/ZenCard.${PASS}.jpg +convert -gravity SouthEast -pointsize 16 -fill black -draw "text 10,25 \"$SALT\"" ~/.zen/tmp/${MOATS}/pass.png ~/.zen/tmp/${MOATS}/salt.png +convert -gravity SouthEast -pointsize 16 -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}/ZenCard.${PASS}.jpg @@ -103,7 +103,7 @@ convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER && sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP ## PRINT PGP AstroID -convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.AstroID.png -resize 400 ~/.zen/tmp/${MOATS}/ASTROPORT.png +convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.ZENCARD.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}/AstroID.${PASS}.jpg @@ -112,7 +112,7 @@ composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.p [[ $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 \ +&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \ && sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP echo "DEBUG" diff --git a/tools/my.sh b/tools/my.sh index dd9fa623..53b795d4 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -467,7 +467,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then ### fi -EARTHCID="/ipfs/Qmb7eXoTXpiwhFVFQavX5wooKsRuM6gvrfPoZY9k5W4cPq" +EARTHCID="/ipfs/QmP7duzqBr6jszapZ9adSe8dBgZyWAdVHsPGep2bNX5Hj3" FLIPPERCID="${EARTHCID}/coinflip" myUPLANET="${myIPFS}${EARTHCID}" ## EMAIL LAT LON KEY