diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 737e108..2330af2 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -173,8 +173,8 @@ else OPT="${OPT}" elif [[ $pre == "x" ]]; then OPT="${OPT}" - elif [[ $(echo ${stname} | grep '@') ]]; then - OPT="${OPT}" + elif [[ $(echo ${stname} | grep '@') && -s ~/.zen/Astroport.ONE/tools/VOEUX.print.sh ]]; then + OPT="${OPT}" else OPT="${OPT}" fi diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 8bc2482..f031a10 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -179,7 +179,7 @@ fi #~ [[ -d ~/.zen/game/players/${STYLE} ]] \ #~ && SRCMAIL=${STYLE} && G1PUB=$(cat ~/.zen/game/players/${STYLE}/.g1pub 2>/dev/null) - BILLETFULLNAME=$(echo "${SRCMAIL} ${SECRET1} ${SECRET2}" | sed 's/ /_/g') # EMAIL_dice_words + BILLETFULLNAME=$(echo "${SRCMAIL} ${SECRET1} ${SECRET2}" | sed 's/ /_/g') # em@ai.l_dice_words #### VOEUX.print.sh G1BILLET+ echo ~/.zen/Astroport.ONE/tools/VOEUX.print.sh "${BILLETFULLNAME}" "G1BILLET+" "${MOATS}" "${G1PUB}" @@ -192,10 +192,10 @@ fi mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png + BILLNS=$(ipfs key import ${NOTERIB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/G1BILLET+.EXTRA.ipfskey) #SIGN & HIDE SECRETS + NOTERIB="https://ipfs.asycn.io/ipns/$BILLNS" XZUID=${SRCMAIL} - SECRET1="G1PASS+@" - SECRET2="Scan : https://astroport.com/@pass" BOTTOM="$(date) :: ♥Box :: G1PASS+@ :: $(hostname) ::" fi diff --git a/README.md b/README.md index 22f44a1..222d65a 100644 --- a/README.md +++ b/README.md @@ -69,14 +69,13 @@ cd G1BILLET # Activation systemd ./setup_systemd.sh -# vous controlez le démon grâce à la commande -# sudo systemctl restart g1billet +## Ajouter raccourci sur votre Bureau +~/.zen/G1BILLET/add_desktop_shortcut.sh ## Ouvrir "Interface Web" xdg-open http://localhost:33101/ - ``` --- @@ -232,8 +231,7 @@ Des questions? Contactez [support@qo-op.com](mailto:support@qo-op.com) --- -# Vous avez bien 2€ à offrir à [OpenCollective](https://opencollective.com/monnaie-libre) +# [OpenCollective](https://opencollective.com/monnaie-libre) ## On compte sur vous. -Les logiciels libres ne sont pas payant, et malgré tous nos effot, nous n'arrivons toujours pas à les faire gratuitement (en UNL €) diff --git a/images/your-own-data-cloud.png b/images/your-own-data-cloud.png new file mode 100644 index 0000000..1aa7fe2 Binary files /dev/null and b/images/your-own-data-cloud.png differ diff --git a/styles/fond/fond_dandelion.jpg b/styles/fond/fond_dandelion.jpg new file mode 100644 index 0000000..141083e Binary files /dev/null and b/styles/fond/fond_dandelion.jpg differ diff --git a/styles/fond/fond_monde1.jpg b/styles/fond/fond_monde1.jpg new file mode 100644 index 0000000..cc7c3d4 Binary files /dev/null and b/styles/fond/fond_monde1.jpg differ