diff --git a/G1BILLETS.sh b/G1BILLETS.sh index e178311..60f7b3e 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -90,10 +90,8 @@ if [[ $MONTANT != "daemon" ]]; then if [[ $DICE -ge 4 || "${STYLE:0:1}" != "_" ]]; then # + ASTRONS ## G1BILLET APP STICKER - ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "${SECRET1}" "${SECRET2}" - ASTRONS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key) - rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key - ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONS" + ASTRONS=$(${MY_PATH}/keygen -t ipfs "${SECRET1}" "${SECRET2}") + echo "/ipns/$ASTRONS" # 12D3Koo style - QRCODE ipfs2g1 verify fi ####################################################################################################### # CREATION FICHIER IMAGE BILLET dans ${MY_PATH}/tmp/g1billet/${UNIQID} diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 7084009..c2d49e3 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -106,7 +106,7 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z rm ${MY_PATH}/tmp/topgp ## CLEANING CACHE DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" - [[ ${STYLE} == "UPlanet" ]] && DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '&' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" ## & ẑencard = (email/8digit)+4digit ## CALLED FROM VISA.new +# [[ ${STYLE} == "UPlanet" ]] && DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '&' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" ## & ẑencard = (email/8digit)+4digit ## CALLED FROM VISA.new echo "$DISCO" @@ -140,9 +140,9 @@ TWIMG="moa_net.png" && TWIMG="web_internet.png" if [[ ${ASTRONS} != "" ]] ; then - ASTROLINK="https://ipfs.asycn.io/ipns/${ASTRONS}" + ASTROLINK="${ASTRONS}" else - ASTROLINK="https://opencollective.com/monnaie-libre" + ASTROLINK="https://opencollective.com/made-in-zen" fi amzqr "${ASTROLINK}" \ @@ -160,7 +160,7 @@ fi # GIBILLET dice > 3 => G1BILLET+ [[ "${STYLE:0:1}" == "_" ]] \ && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \ - && BOTTOM="$(date) :: ♥Box :: G1BILLET+ :: $(hostname) ::" + && BOTTOM="$(date) :: ♥Box :: ẐBILLET+ :: $(hostname) ::" [[ "${STYLE:0:1}" != "_" ]] \ && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \ @@ -172,7 +172,7 @@ fi [[ "${STYLE}" == "UPlanet" ]] \ && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \ - && BOTTOM="$(date) :: ♥UPLANET :: ZENCARD+TW :: $(hostname) ::" + && BOTTOM="$(date) :: ♥UPLANET :: MADE-IN-ZEN :: $(hostname) ::" if [[ "${STYLE:0:1}" == "@" || "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] ; then #~ ########################## G1Voeu _ G1BILLET linking ## @@ -225,13 +225,13 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "x" && ${MONTANT} != "___" ]]; convert -font 'Liberation-Sans' \ -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \ -pointsize 150 -fill black -draw 'text 120,380 "'"$MONTANT"'"' \ --pointsize 20 -fill black -draw 'text 340,22 "'"${NOTERIB}"'"' \ +-pointsize 20 -fill black -draw 'text 340,22 "'"${NOTERIB}:ZEN"'"' \ -pointsize 25 -fill black -draw 'text 50,440 "'"$BOTTOM"'"' \ "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" else convert -font 'Liberation-Sans' \ -pointsize 35 -fill black -draw 'text 50,56 "'"$XZUID"'"' \ --pointsize 22 -fill black -draw 'text 340,26 "'"${NOTERIB}"'"' \ +-pointsize 22 -fill black -draw 'text 340,26 "'"${NOTERIB}:ZEN"'"' \ -pointsize 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \ -pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \ -pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \