diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 83510e4f..bdeb8bd3 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -157,8 +157,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
echo "COINScheck.sh ${G1PUB}"
${MY_PATH}/../tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
- cat ~/.zen/tmp/${G1PUB}.curcoin
- CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1 | cut -d '.' -f 1) ## ROUNDED G1 COIN
+ CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1 | cut -d '.' -f 1)
CURZEN=$(echo "($CURCOINS - 1) * 10" | bc | cut -d '.' -f 1)
echo "= $CURCOINS G1 / $CURZEN ZEN"
@@ -265,7 +264,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
(
echo "$HTTPCORS
LOGIN ERROR
Could not find PLAYER on ZEN Station" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 \
- && echo "ERROR PLAYER SLURP"
+ && echo "SLURP PLAYER ERROR ${player}"
) &
exit 0
fi
@@ -341,7 +340,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
(
cat ~/.zen/tmp/${MOATS}/disco | 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}
) &
exit 0
@@ -558,7 +557,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
(
cat ~/.zen/tmp/${MOATS}/disco | 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}
) &
exit 0
@@ -597,7 +596,7 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then
cat ~/.zen/tmp/${MOATS}/g1voeu.json >> ~/.zen/tmp/${MOATS}/index.redirect
(
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 g1voeu.json $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
exit 0
@@ -634,7 +633,7 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then
echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/index.redirect
(
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 ${LINK} $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
exit 0
fi
@@ -646,10 +645,11 @@ QRCODE="${QRCODE%%:*}" ## TRIM :ZEN :ChK
################################################################################
################################################################################
## QRCODE IS IPNS FORMAT "12D3Koo" ( try ipfs_to_g1 )
-IPNS2G1=$(${MY_PATH}/../tools/ipfs_to_g1.py ${QRCODE} 2>/dev/null)
-[[ ${IPNS2G1} != "" ]] \
+IPNS2G1=$(${MY_PATH}/../tools/ipfs_to_g1.py ${QRCODE} 2>/dev/null) ## NOT SURE. works on any string ;)
+[[ ${ZCHK} == "" && ${#IPNS2G1} -ge 40 && ${QRCODE::4} == "12D3" ]] \
&& echo "${PORT} QRCODE IS IPNS ADDRESS : ${myIPFS}/ipns/${QRCODE}" \
&& (echo "$HTTPCORS Loading from IPFS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
+ && echo "PRULS /ipns/${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \
&& exit 0
## TEST G1 TYPE ( try g1_to_ipfs )
@@ -657,6 +657,7 @@ ASTROTOIPNS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${QRCODE} 2>/dev/null)
[[ ! ${ASTROTOIPNS} ]] \
&& echo "${PORT} INVALID QRCODE : ${QRCODE}" \
&& (echo "$HTTPCORS ERROR - INVALID QRCODE : ${QRCODE}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
+ && echo "PRULS INVALID ${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \
&& exit 1
################################################################################
echo "############################################################################"
@@ -672,27 +673,28 @@ echo ">>> ${QRCODE} g1_to_ipfs $ASTROTOIPNS"
DISPLAY="$VISITORCOINS G1"
[[ $ZCHK == "ZEN" ]] && DISPLAY="$ZEN ẐEN"
-## WALLET VIERGE
-###########################################
-if [[ $VISITORCOINS == "null" ]]; then
+ ## WALLET VIERGE
+ ###########################################
+ if [[ $VISITORCOINS == "null" ]]; then
- echo ""
+ echo ""
- echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
- echo "
EMPTY. PLEASE CHARGE.
- ... Send dotation to made-in-zen ? Contact support
- ($myHOST)" >> ~/.zen/tmp/${MOATS}/index.redirect
- (
- cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
- ) &
- exit 0
+ echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
+ echo "EMPTY. PLEASE CHARGE.
+ ... Send ZEN ? Contact support
+ ($myHOST)" >> ~/.zen/tmp/${MOATS}/index.redirect
+ (
+ cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
+ echo "BLURP null ZEN $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
+ ) &
+ exit 0
-fi
+ fi
+ ## WE SEND WALLET AMOUNT DISPLAY
(
echo "$HTTPCORS ${ZCHK} : ${QRCODE}
${DISPLAY}
" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
- echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
+ echo "BLURP ${DISPLAY} $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
) &
exit 0
diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh
index 3b0a854a..568b95dc 100755
--- a/RUNTIME/VOEUX.refresh.sh
+++ b/RUNTIME/VOEUX.refresh.sh
@@ -58,7 +58,8 @@ tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1vo
[[ ! -s ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1voeu.json ]] && echo "AUCUN G1VOEU - EXIT -" && exit 0
cat ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1voeu.json | jq -r '.[].wish' > ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt
-echo $(cat ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt | wc -l)" VOEUX : ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt "
+wishnumbers=$(cat ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt | wc -l)
+echo "${wishnumbers} VOEUX : ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt "
## ${PLAYER}.g1wishes.txt contains all TW G1PUB : IPNS key name
echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
@@ -266,32 +267,34 @@ done < ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt
################################################
### SEND GRATITUDE TO SECTOR
## GET "GPS" TIDDLER
-tiddlywiki --load ${INDEX} \
- --output ~/.zen/tmp/${MOATS} \
- --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
-TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
-LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
-[[ ${LAT} == "null" ]] && LAT="0.00"
-LAT=$(makecoord $LAT)
-LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
-[[ ${LON} == "null" ]] && LON="0.00"
-LON=$(makecoord $LON)
-echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
-rm ~/.zen/tmp/${MOATS}/GPS.json
-SECLAT="${LAT::-1}"
-SECLON="${LON::-1}"
-SECTOR="_${SECLAT}_${SECLON}"
-##############################################################
-SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
-##############################################################
-GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh)
-G1AMOUNT=$(echo "$GRATITUDE / 10" | bc -l | xargs printf "%.2f" )
-echo "***** PLAYER $PLAYER *************************************"
-echo "SEND ${GRATITUDE} ZEN = ${G1AMOUNT} G1
-to ${SECTOR} WALLET ${SECTORG1PUB}"
-echo "************************************************************"
-MYWISHFLUX=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/* | tail -n 1) # ADDING JSONS TO IPFS
-${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${G1AMOUNT}" "${SECTORG1PUB}" "IPFS:${MYWISHFLUX}"
+if [[ ${wishnumbers} -gt 0 ]]; then
+ tiddlywiki --load ${INDEX} \
+ --output ~/.zen/tmp/${MOATS} \
+ --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
+ TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
+ LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
+ [[ ${LAT} == "null" ]] && LAT="0.00"
+ LAT=$(makecoord $LAT)
+ LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
+ [[ ${LON} == "null" ]] && LON="0.00"
+ LON=$(makecoord $LON)
+ echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
+ rm ~/.zen/tmp/${MOATS}/GPS.json
+ SECLAT="${LAT::-1}"
+ SECLON="${LON::-1}"
+ SECTOR="_${SECLAT}_${SECLON}"
+ ##############################################################
+ SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
+ ##############################################################
+ GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh)
+ G1AMOUNT=$(echo "$GRATITUDE / 10" | bc -l | xargs printf "%.2f" )
+ echo "***** PLAYER $PLAYER *************************************"
+ echo "SEND ${GRATITUDE} ZEN = ${G1AMOUNT} G1
+ to ${SECTOR} WALLET ${SECTORG1PUB}"
+ echo "************************************************************"
+ MYWISHFLUX=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/* | tail -n 1) # ADDING JSONS TO IPFS
+ ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${G1AMOUNT}" "${SECTORG1PUB}" "IPFS:${MYWISHFLUX}"
+fi
################################################
################################################ GRATITUDE SENT TO SECTOR