1 Zen = 1 Zen
This commit is contained in:
parent
72f450da0d
commit
64c4d5af23
|
@ -277,7 +277,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
|||
|
||||
## history & read
|
||||
# cp ~/.zen/tmp/${MOATS}/secret.key ~/.zen/tmp/
|
||||
qrencode -s 6 -o "${HOME}/.zen/tmp/${MOATS}/disco.qr.png" "${G1PUB}"
|
||||
qrencode -s 6 -o "${HOME}/.zen/tmp/${MOATS}/disco.qr.png" "${G1PUB}:ZEN"
|
||||
QRURL=${myIPFS}/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/disco.qr.png)
|
||||
ONVADIRE="<h1> ~ ${CURCOINS} Ğ1</h1>${G1PUB}<br><br><img src=${QRURL} />"
|
||||
echo "${ONVADIRE}" >> ~/.zen/tmp/${MOATS}/disco
|
||||
|
@ -375,6 +375,13 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
|||
|
||||
fi
|
||||
|
||||
### THIS QRCODE IS EMAIL/PASS/PIN STYLE
|
||||
if [[ ${QRCODE:0:5} == "ẑẑẑẑẑ" ]]; then
|
||||
PASS=$(urldecode ${THIS})
|
||||
echo "ZENCARD UPlanet QRCODE : PIN=${PASS}"
|
||||
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
## QRCODE = G1Milgram G1Missive PGP ENCRYPTED STRING
|
||||
# /?qrcode=@@@@@BEGIN%20PGP%20MESSAGE@@@@@~~jA0ECQM...............
|
||||
|
|
|
@ -109,6 +109,7 @@ Après l'installation, vous devriez avoir 3 nouveaux raccourcis sur votre "Burea
|
|||
|
||||
* "Astroport" qui ouvre le portail de votre Station : http://astroport.localhost:1234
|
||||
* "REC" qui permet d'enregistrer vos fichiers sur IPFS et publier leur Capusle dans votre TW
|
||||
* "G1BILLET" permet de créer des ZenCard et autres QRCodes utiles
|
||||
|
||||
## Comment Gérer votre "Astroport" !
|
||||
|
||||
|
@ -390,7 +391,8 @@ We choose to use "NaCl" (secret1 / secret) 2 key generation, so it is easy to un
|
|||
|
||||
**(SECRET1/SECRET2) mixing**
|
||||
|
||||
* If PLAYER key is (SECRET1/SECRET2) and G1PUB and EMAIL + TW
|
||||
* If PLAYER key is (SECRET1 / SECRET2) and G1PUB and EMAIL + TW
|
||||
* feed key (SECRET1 / SECRET2 G1PUB)
|
||||
* wishes keys are (SECRET2 / WishName EMAIL)
|
||||
* sub-wishes are (EMAIL / G1WishName G1PUB)
|
||||
* wish-billets are (EMAIL_dice_words / G1WishName G1PUB)
|
||||
|
|
|
@ -103,8 +103,8 @@ mkdir -p ~/.zen/tmp/${MOATS}
|
|||
cp ~/.zen/tmp/${MOATS}/START.png ~/.zen/game/world/${VoeuName}/${WISHG1PUB}/
|
||||
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.ASTROLINK.png" "$LIBRA/ipns/$ASTRONAUTENS"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1ASTRO.png" "$G1PUB"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1WISH.png" "${WISHG1PUB}"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1ASTRO.png" "${G1PUB}:ZEN"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1WISH.png" "${WISHG1PUB}:ZEN"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.IPNS.png" "/ipns/${VOEUNS}"
|
||||
|
||||
#################################
|
||||
|
|
|
@ -194,7 +194,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
|
||||
mkdir -p ~/.zen/game/players/${PLAYER}/ipfs/G1SSB # Prepare astrXbian sub-datastructure "DEPRECATED"
|
||||
|
||||
qrencode -s 12 -o ~/.zen/game/players/${PLAYER}/QR.png "$G1PUB"
|
||||
qrencode -s 12 -o ~/.zen/game/players/${PLAYER}/QR.png "$G1PUB:ZEN" ## ZEN specific G1PUB QRCODE - break G1 compatibility -
|
||||
cp ~/.zen/game/players/${PLAYER}/QR.png ~/.zen/game/players/${PLAYER}/ipfs/QR.png
|
||||
echo "$G1PUB" > ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.pubkey # G1SSB NOTATION (astrXbian compatible)
|
||||
|
||||
|
@ -337,8 +337,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
cat ${MY_PATH}/../templates/data/local.api.json | sed "s~_NID_~${WID}~g" > ~/.zen/tmp/${MOATS}/local.api.json
|
||||
cat ${MY_PATH}/../templates/data/local.gw.json | sed "s~_NID_~${NID}~g" > ~/.zen/tmp/${MOATS}/local.gw.json
|
||||
|
||||
# Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$G1PUB"
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$G1PUB"
|
||||
# Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$PEPPER $G1PUB"
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$PEPPER $G1PUB"
|
||||
FEEDNS=$(ipfs key import "${PLAYER}_feed" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/feed.ipfskey)
|
||||
|
||||
## MAKE LightBeam Plugin Tiddler ${PLAYER}_feed
|
||||
|
@ -384,7 +384,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
############################################################################ G1TW
|
||||
#### MAKE G1TW
|
||||
[[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] && \
|
||||
~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER"
|
||||
~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER"
|
||||
#### MADE # BILLETNAME=$(echo "$SALT" | sed 's/ /_/g') ##
|
||||
# IMAGE ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg
|
||||
############################################################################
|
||||
|
@ -393,12 +393,12 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
if [[ $(which amzqr) ]]; then
|
||||
|
||||
GIMG="${MY_PATH}/../images/moa_net.png"
|
||||
CIMG="${MY_PATH}/../images/g1ticket.png"
|
||||
CIMG="${MY_PATH}/../images/zenticket.png"
|
||||
|
||||
# QRG1avatar.png
|
||||
[[ ! -s ~/.zen/game/players/${PLAYER}/QRG1avatar.png ]] && amzqr ${G1PUB} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null
|
||||
[[ ! -s ~/.zen/game/players/${PLAYER}/QRG1avatar.png ]] && amzqr "${G1PUB}:ZEN" -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null
|
||||
# QRTWavatar.png
|
||||
[[ ! -s ~/.zen/game/players/${PLAYER}/QRTWavatar.png ]] && amzqr ${myIPFSGW}/ipns/$ASTRONAUTENS -l H -p "$GIMG" -c -n QRTWavatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null
|
||||
[[ ! -s ~/.zen/game/players/${PLAYER}/QRTWavatar.png ]] && amzqr "${myIPFSGW}/ipns/${ASTRONAUTENS}" -l H -p "$GIMG" -c -n QRTWavatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null
|
||||
|
||||
else
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
|
@ -4,7 +4,7 @@
|
|||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||
########################################################################
|
||||
# INSERT NEW TIDDLERS FROM RSS JSON INTO UPLANET TW
|
||||
# DETECTING CONFLICT WITH ON SAME TITLE
|
||||
# DETECTING CONFLICT WITH SAME TITLE
|
||||
# ASKING TO EXISTING SIGNATURES TO UPDATE THEIR TW OR FORK TITLE
|
||||
########################################################################
|
||||
MY_PATH="`dirname \"$0\"`" # relative
|
||||
|
@ -21,12 +21,13 @@ INDEX=$4
|
|||
[[ ! -s ${INDEX} ]] && echo "BAD TW INDEX" && exit 1
|
||||
|
||||
echo "SECTOR TW INSERTING" ${RSS}
|
||||
## NEW RULE. ONLY 2 SIGNATURES TIDDLERS COMES UP
|
||||
|
||||
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} == "ZenCard" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
|
||||
[[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
|
||||
&& echo "FILTERED TITLE ${title}" && continue
|
||||
|
||||
## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW
|
||||
|
|
|
@ -47,8 +47,8 @@ else
|
|||
PSEUDO="${PLAYER}"
|
||||
|
||||
mkdir -p ~/.zen/game/players/${PLAYER}/
|
||||
CIMG="${MY_PATH}/../images/g1ticket.png"
|
||||
amzqr ${G1PUB} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/
|
||||
CIMG="${MY_PATH}/../images/zenticket.png"
|
||||
amzqr "${G1PUB}:ZEN" -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/
|
||||
|
||||
fi
|
||||
|
||||
|
@ -61,8 +61,8 @@ LP=$(ls /dev/usb/lp* | head -n 1 2>/dev/null)
|
|||
|
||||
# USE G1BILLET GENERATOR
|
||||
[[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] \
|
||||
&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER" \
|
||||
&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER" \
|
||||
&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER" \
|
||||
&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER" \
|
||||
|| ( echo "MISSING G1BILLET ENGINE - ERROR - " && exit 1 )
|
||||
|
||||
s=$(${MY_PATH}/diceware.sh 1 | xargs)
|
||||
|
|
|
@ -161,7 +161,7 @@ select zwish in "${vlist[@]}"; do
|
|||
;;
|
||||
|
||||
"Ğ1")
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png" "${voeu}"
|
||||
qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png" "${voeu}:ZEN"
|
||||
convert $HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png -resize 600 ~/.zen/tmp/${MOATS}/START.png
|
||||
break
|
||||
;;
|
||||
|
|
|
@ -90,7 +90,7 @@ if [[ ! -d $img_dir ]]; then
|
|||
|
||||
|
||||
# CREATE G1 AMZQR
|
||||
CIMG="$MY_PATH/../images/g1ticket.png"
|
||||
CIMG="$MY_PATH/../images/zenticket.png"
|
||||
amzqr ${pub} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/
|
||||
convert ~/.zen/game/players/${PLAYER}/QRG1avatar.png -resize 250 ~/.zen/tmp/QR.png
|
||||
# ADD IT
|
||||
|
|
Loading…
Reference in New Issue