forked from STI/Astroport.ONE
plenty little things
This commit is contained in:
parent
96b5fd260d
commit
e16d8777c3
|
@ -177,7 +177,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
## CREATE game pending TX
|
## CREATE game pending TX
|
||||||
mkdir -p $HOME/.zen/game/pending/${G1PUB}/
|
mkdir -p $HOME/.zen/game/pending/${G1PUB}/
|
||||||
PENDING="$HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX"
|
PENDING="$HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX"
|
||||||
echo "UNKNOWN" > ${PENDING}
|
echo "START" > ${PENDING}
|
||||||
######################## ~/.zen/game/pending/*/*_G1WHO+*.TX
|
######################## ~/.zen/game/pending/*/*_G1WHO+*.TX
|
||||||
if [[ ! -f ~/.zen/game/pending/*/*_${VAL}+*.TX ]]; then
|
if [[ ! -f ~/.zen/game/pending/*/*_${VAL}+*.TX ]]; then
|
||||||
# MAKE PAYMENT
|
# MAKE PAYMENT
|
||||||
|
@ -254,8 +254,8 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
if [[ ${APPNAME} == "flipper" ]]; then
|
if [[ ${APPNAME} == "flipper" ]]; then
|
||||||
## Open OSM2IPF "getreceiver" App
|
## Open OSM2IPF "getreceiver" App
|
||||||
|
|
||||||
BASE="qrcode=$(urlencode "${QRCODE}")&pass=${PASS}"
|
BASE="qrcode=${QRCODE}&pass=${PASS}"
|
||||||
LINK="${myIPFS}${GETRECEIVERCID}/?${BASE}&coins=${CURCOINS}"
|
LINK="${myIPFS}${FLIPPERCID}/?${BASE}&coins=${CURCOINS}"
|
||||||
echo "LINK:$LINK"
|
echo "LINK:$LINK"
|
||||||
echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco
|
echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco
|
||||||
echo "<script>window.location.href = '${LINK}';</script>" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<script>window.location.href = '${LINK}';</script>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
@ -566,8 +566,8 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
||||||
|
|
||||||
else
|
else
|
||||||
## TODO : EMPTY WALLET BACK TO ORIGIN
|
## TODO : EMPTY WALLET BACK TO ORIGIN
|
||||||
echo "<br><h1>${PASS} ${UPASS} TOO OLD</h1>" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<br><h1>${PASS} ${UPASS} ARE BAD</h1>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
echo "<br><img src='http://127.0.0.1:8080/ipfs/QmVnQ3GkQjNeXw9qM7Fb1TFzwwxqRMqD9AQyHfgx47rNdQ/your-own-data-cloud.svg' />" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<br><img src='/ipfs/QmVnQ3GkQjNeXw9qM7Fb1TFzwwxqRMqD9AQyHfgx47rNdQ/your-own-data-cloud.svg' />" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -726,6 +726,7 @@ CURG1=$(cat ~/.zen/game/players/.current/.g1pub)
|
||||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1}"
|
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1}"
|
||||||
CURCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${CURG1} | tail -n 1)
|
CURCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${CURG1} | tail -n 1)
|
||||||
echo "AUTOGRAPH $CURPLAYER : $CURCOINS G1"
|
echo "AUTOGRAPH $CURPLAYER : $CURCOINS G1"
|
||||||
|
ZEN=$(echo "($CURCOINS - 1) * 10" | bc | cut -d '.' -f 1)
|
||||||
|
|
||||||
## WALLET VIERGE
|
## WALLET VIERGE
|
||||||
###########################################
|
###########################################
|
||||||
|
@ -750,7 +751,7 @@ fi
|
||||||
if [[ ${CURG1} == ${QRCODE} ]]; then
|
if [[ ${CURG1} == ${QRCODE} ]]; then
|
||||||
## SCANNED G1PUB IS CURRENT STATION PLAYER : RETURN BALANCE
|
## SCANNED G1PUB IS CURRENT STATION PLAYER : RETURN BALANCE
|
||||||
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
echo "<h1>$CURPLAYER WALLET : $CURCOINS Ǧ1</h1>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
echo "<h1>$CURPLAYER WALLET : $ZEN ẐEN</h1>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
(
|
(
|
||||||
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||||
echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
|
echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
|
||||||
|
@ -763,14 +764,14 @@ else
|
||||||
|
|
||||||
## EMPTY WALLET ? PREPARE PALPE WELCOME
|
## EMPTY WALLET ? PREPARE PALPE WELCOME
|
||||||
if [[ $VISITORCOINS == "null" ]]; then
|
if [[ $VISITORCOINS == "null" ]]; then
|
||||||
# CADEAU DE 10 JUNE (Si le .current en a plus que 100)
|
# CADEAU DE 10 ZEN (Si le .current a plus de 100 G1)
|
||||||
PALPE=1
|
PALPE=1
|
||||||
echo "PALPE=1"
|
echo "PALPE=1"
|
||||||
else
|
else
|
||||||
PALPE=0
|
PALPE=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "VISITEUR POSSEDE ${VISITORCOINS} G1"
|
echo "VISITEUR POSSEDE ${VISITORCOINS} G1 ($ZEN ZEN)"
|
||||||
|
|
||||||
## GET G1 WALLET HISTORY
|
## GET G1 WALLET HISTORY
|
||||||
if [[ ${VISITORCOINS} != "null" && ${VISITORCOINS} > 0 ]]; then
|
if [[ ${VISITORCOINS} != "null" && ${VISITORCOINS} > 0 ]]; then
|
||||||
|
@ -779,7 +780,7 @@ else
|
||||||
&& ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json
|
&& ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json
|
||||||
|
|
||||||
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
echo "<h1>Solde $VISITORCOINS Ǧ1</h1>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
echo "<h1>Solde $ZEN ẐEN</h1>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
echo "<h2><a target=_blank href="$myIPFS/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json)">HISTORIQUE ${QRCODE}</a></h2>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
echo "<h2><a target=_blank href="$myIPFS/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json)">HISTORIQUE ${QRCODE}</a></h2>" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
(
|
(
|
||||||
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||||
|
@ -850,7 +851,7 @@ else
|
||||||
else
|
else
|
||||||
## MESSAGE TO LINKED CESIUM WALLET
|
## MESSAGE TO LINKED CESIUM WALLET
|
||||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k ${MYPLAYERKEY} send -d "${CPLUS}" -t "COUCOU" \
|
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k ${MYPLAYERKEY} send -d "${CPLUS}" -t "COUCOU" \
|
||||||
-m "VOTRE PORTEFEUILLE ${QRCODE} A ETE SCANNE PAR $myASTROPORT - IL CONTIENT ${VISITORCOINS} G1 -"
|
-m "VOTRE PORTEFEUILLE ${QRCODE} A ETE SCANNE PAR $myASTROPORT - IL CONTIENT ${ZEN} ZEN -"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -119,16 +119,18 @@ a {
|
||||||
</header>
|
</header>
|
||||||
<form method='get' action='http://127.0.0.1:33101' target='aframe'>
|
<form method='get' action='http://127.0.0.1:33101' target='aframe'>
|
||||||
<input type='hidden' name='montant' value='0' >
|
<input type='hidden' name='montant' value='0' >
|
||||||
<label for='type'>Type :</label><select name='type'>
|
<input type='text' name='type' value='@' >
|
||||||
|
<!--
|
||||||
|
<label for='type'>Type :</label>
|
||||||
|
<select name='type'>
|
||||||
<option value=''>G1BILLET+ ( x 6 )</option>
|
<option value=''>G1BILLET+ ( x 6 )</option>
|
||||||
<option value='jeu' selected>AstroID</option>
|
<option value='jeu' selected>AstroID</option>
|
||||||
<option value='xastro'>AstroID+TW</option>
|
<option value='xastro'>AstroID+TW</option>
|
||||||
</select><input type='hidden' name='dice' value='6' >
|
</select>
|
||||||
<button type='submit'>Lancer Fabrication</button>
|
-->
|
||||||
|
<input type='hidden' name='dice' value='6' >
|
||||||
|
<button type='submit'>you want ZenCard</button>
|
||||||
</form>
|
</form>
|
||||||
<h3>Oubliez la crise !</h3>
|
|
||||||
<h2>Utilisez la Monnaie Libre.</h2>
|
|
||||||
<h3>Explorez le Monde en confiance...</h3>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="showoff">
|
<div id="showoff">
|
||||||
|
|
|
@ -26,7 +26,7 @@ cat "${RSS}" | jq -r '.[] | .title' > ~/.zen/tmp/${MOATS}/titles.list
|
||||||
|
|
||||||
while read title; do
|
while read title; do
|
||||||
|
|
||||||
[[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${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
|
&& echo "FILTERED TITLE ${title}" && continue
|
||||||
|
|
||||||
## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW
|
## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW
|
||||||
|
|
|
@ -40,7 +40,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)
|
||||||
SECRET1="${PLAYER}"
|
SECRET1="${PLAYER}"
|
||||||
SECRET2="G1${VoeuName} ${G1PUB}"
|
SECRET2="G1${VoeuName} ${G1PUB}"
|
||||||
|
|
||||||
## ATTACHED G1BILLET+
|
## ATTACHED G1BILLET+ "EMAIL_SEC1_SEC2"
|
||||||
[[ $(echo ${PLAYER_} | grep '_' ) ]] \
|
[[ $(echo ${PLAYER_} | grep '_' ) ]] \
|
||||||
&& echo "G1BILLET+ interlinked : salt pepper refining" \
|
&& echo "G1BILLET+ interlinked : salt pepper refining" \
|
||||||
&& murge=($(echo "${PLAYER_}" | cut -d '_' -f 2- | sed 's/_/ /g' | xargs)) \
|
&& murge=($(echo "${PLAYER_}" | cut -d '_' -f 2- | sed 's/_/ /g' | xargs)) \
|
||||||
|
|
|
@ -470,6 +470,4 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
|
||||||
###
|
###
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ASTROJSCID="/ipfs/"
|
FLIPPERCID="/ipfs/QmbnqZz17U6Kiea5UzKb9B9gWfXBRmvrd8u5TDRQCJ749u/coinflip"
|
||||||
LOGINCID="/ipfs/"
|
|
||||||
GETRECEIVERCID="/ipfs/QmXctju7CKDEwpesQSvSyfxfVdZqhdMdfMx3MikB6u7mLd"
|
|
||||||
|
|
Loading…
Reference in New Issue