diff --git a/API/QRCODE.sh b/API/QRCODE.sh index d2158622..99ffab2f 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -34,7 +34,7 @@ function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } mkdir -p ~/.zen/tmp/${MOATS}/ ################################################################################ -## QRCODE IS HTTP LINK +## QRCODE IS HTTP LINK REDIRECT TO ############################################################################### if [[ ${QRCODE:0:4} == "http" ]]; then ## THIS IS A WEB LINK @@ -401,7 +401,7 @@ fi # DETECT TO REWARD IN REGARD TO WALLET EVOLUTION ########################################### G1 PRICE : null 1 + gchange 10 + cesium 50 if [[ ${CURG1} == ${QRCODE} ]]; then - + ## SCANNED G1PUB IS CURRENT STATION PLAYER : RETURN BALANCE echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect echo "

$CURPLAYER WALLET : $CURCOINS Ǧ1

" >> ~/.zen/tmp/${MOATS}/index.redirect ( diff --git a/_12345.sh b/_12345.sh index fd8c08d4..d5bb1530 100755 --- a/_12345.sh +++ b/_12345.sh @@ -124,7 +124,7 @@ while true; do ## LOOKING IF ITS SWARM MAP COULD COMPLETE MINE echo "ANALYSING BOOTSTRAP SWARM MAP" itipnswarmap=$(cat ~/.zen/tmp/swarm/${ipfsnodeid}/map.${nodeip}.json | jq -r '.myswarm' | rev | cut -d '/' -f 1 | rev ) - ipfs ls /ipns/${itipnswarmap} | rev | cut -d ' ' -f 1 | rev > ~/.zen/tmp/_swarm.${ipfsnodeid} + ipfs ls /ipns/${itipnswarmap} | rev | cut -d ' ' -f 1 | rev | cut -d '/' -f 1 > ~/.zen/tmp/_swarm.${ipfsnodeid} echo "ZNODS LIST" cat ~/.zen/tmp/_swarm.${ipfsnodeid} @@ -231,7 +231,7 @@ Content-Type: application/json; charset=UTF-8 && T2WAIT=$((3600-${RANDOM:0:3})) \ || T2WAIT=$(cat ~/.zen/tmp/random.sleep) - if [[ $T2WAIT == 0 || $T2WAIT != $(cat ~/.zen/tmp/random.sleep) ]]; then + if [[ $T2WAIT == 0 || $T2WAIT != $(cat ~/.zen/tmp/random.sleep 2>/dev/null) ]]; then ( echo $T2WAIT > ~/.zen/tmp/random.sleep sleep $T2WAIT && rm ~/.zen/tmp/random.sleep @@ -262,7 +262,7 @@ Content-Type: application/json; charset=UTF-8 GPUB=${arr[0]} ASTROTOIPFS=$(${MY_PATH}/tools/g1_to_ipfs.py ${arr[0]} 2>/dev/null) - if [[ "${ASTROTOIPFS}" == "${arr[1]}" ]]; then + if [[ "${ASTROTOIPFS}" == "${arr[1]}" && ${ASTROTOIPFS} != "" && ${arr[1]} != "" ]]; then ## WE SPEAK THE SAME PROTOCOL echo "MAJOR TOM TO GROUD CONTROL" echo "WE HAVE A STATION ${GPUB} CONTACT" diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index 2a946cbe..ea2f784e 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -48,9 +48,9 @@ ASTRONAUTENS=$(ipfs key list -l | grep -w "${G1PUB}" | cut -d ' ' -f 1) -p ~/.zen/tmp/${MOATS}/result.png -c convert -gravity northwest -pointsize 25 -fill black -draw "text 5,5 \"${PLAYER} - ${UPASS} \"" ~/.zen/tmp/${MOATS}/result_qrcode.png ~/.zen/tmp/${MOATS}/layer1.png - convert -gravity southeast -pointsize 25 -fill black -draw "text 5,5 \"${VoeuName}\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/final.png + convert -gravity southeast -pointsize 25 -fill black -draw "text 5,5 \"${VoeuName}\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/START.png - IMAGIC=$(ipfs add -Hq ~/.zen/tmp/${MOATS}/final.png | tail -n 1) + IMAGIC=$(ipfs add -Hq ~/.zen/tmp/${MOATS}/START.png | tail -n 1) echo ${IMAGIC} exit 0 @@ -119,7 +119,7 @@ select zwish in "${vlist[@]}"; do ;; "Ğ1Milgram") - + GW="https://qo-op.com" # CREATE G1Milgram IMAGIC=$(${MY_PATH}/VOEUX.print.sh "${PLAYER}" "${TITLE}" "${MOATS}" | tail -n 1) @@ -156,7 +156,7 @@ select zwish in "${vlist[@]}"; do done convert -gravity northwest -pointsize 40 -fill black -draw "text 50,2 \"${TITLE} ($typ)\"" ~/.zen/tmp/${MOATS}/START.png ~/.zen/tmp/${MOATS}/g1voeu1.png - convert -gravity southeast -pointsize 30 -fill black -draw "text 50,2 \"${GW}\"" ~/.zen/tmp/${MOATS}/g1voeu1.png ~/.zen/tmp/${MOATS}/g1voeu.png + convert -gravity southeast -pointsize 30 -fill black -draw "text 100,2 \"${GW}\"" ~/.zen/tmp/${MOATS}/g1voeu1.png ~/.zen/tmp/${MOATS}/g1voeu.png #~ echo "~/.zen/tmp/${MOATS}/g1voeu.png READY ?" [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/g1voeu.png diff --git a/www/G1PalPay/pay.html b/www/G1PalPay/pay.html deleted file mode 100644 index 9a3793dc..00000000 --- a/www/G1PalPay/pay.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - ♥Box - G1PASS PAY2ACCESS - - - - - - - - - - - - - - - - -
-
-
-

♥Box Ğ1Station


- -

Scannez votre G1PASS !

-

Versez _PRICE_ Ğ1

-

pour accéder à _TITTLE_

-
-
-
-
-
- - - -

-

- -
- -

G1PASS

- -
- - -
-
- -
-
- - -

-
MENU - -
- - - -