From fbf9ded5efcbf5e4a3c05c194e3f5fe5f71c4d78 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 25 Apr 2023 14:50:40 +0200 Subject: [PATCH] ASTRONAUTENS --- API/QRCODE.sh | 2 +- ASTROBOT/G1PalPay.sh | 36 +++++++++++++++++------------------- README.md | 18 +++++++++--------- templates/register.html | 4 ++-- www/G1PalPay/index.html | 2 +- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 4886a961..d2158622 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -215,7 +215,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then || ASTRONAUTENS=${ISTHERE} ( ## 1 HOUR SESSION - [[ ${ISTHERE} == "" ]] && echo "SESSION START" && sleep 3600 && echo "${PLAYER} SESSION OVER" && ipfs key rm ${PLAYER} + [[ ${ISTHERE} == "" ]] && echo "${PLAYER} SESSION START" && sleep 3600 && echo "${PLAYER} SESSION END" && ipfs key rm ${PLAYER} ) & REPLACE=${myIPFS}/ipns/${ASTRONAUTENS} diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh index 815adcab..e64b2750 100755 --- a/ASTROBOT/G1PalPay.sh +++ b/ASTROBOT/G1PalPay.sh @@ -35,15 +35,15 @@ PLAYER="$2" [[ ! ${PLAYER} ]] && PLAYER="$(cat ~/.zen/game/players/.current/.player 2>/dev/null)" [[ ! ${PLAYER} ]] && echo "ERROR - Please provide PLAYER" && exit 1 -ASTONAUTENS=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1) -[[ ! $ASTONAUTENS ]] && echo "ERROR - Clef IPNS ${PLAYER} introuvable!" && exit 1 +ASTRONAUTENS=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1) +[[ ! ${ASTRONAUTENS} ]] && echo "ERROR - Clef IPNS ${PLAYER} introuvable!" && exit 1 G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub) [[ ! $G1PUB ]] && echo "ERROR - G1PUB ${PLAYER} VIDE" && exit 1 # Extract tag=tube from TW MOATS="$3" -[[ ! $MOATS ]] && MOATS=$(date -u +"%Y%m%d%H%M%S%4N") +[[ ! ${MOATS} ]] && MOATS=$(date -u +"%Y%m%d%H%M%S%4N") ################################################################### ## CREATE APP NODE PLAYER PUBLICATION DIRECTORY @@ -67,8 +67,8 @@ cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[] while read LINE; do echo "MATCHING IN COMMENT" - echo "$LINE" - JSON=$LINE + echo "${LINE}" + JSON=${LINE} IDATE=$(echo $JSON | jq -r .date) IPUBKEY=$(echo $JSON | jq -r .pubkey) IAMOUNT=$(echo $JSON | jq -r .amount) @@ -90,23 +90,21 @@ while read LINE; do for EMAIL in "${ICOMMENT[@]}"; do - [[ $EMAIL == $PLAYER ]] && echo "My PalPay" && continue + [[ ${EMAIL} == $PLAYER ]] && echo "ME MYSELF" && continue echo "EMAIL : ${EMAIL}" ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" $($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more -echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS" +echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" if [[ ! ${ASTROTW} ]]; then - echo "# NEW VISA $(date)" - SALT="" && PEPPER="" - echo "VISA.new : \"$SALT\" \"$PEPPER\" \"${EMAIL}\" \"$PSEUDO\" \"${URL}\"" + echo "# PLAYER INCONNU $(date)" fi - [[ ! $ASTROG1 ]] \ + [[ ! ${ASTROG1} ]] \ && echo "SORRY ${EMAIL} MISSING ASTROG1" \ && echo " $PLAYER VEUX VOUS OFFRIR ${SHARE} G1 \n Joignez-vous au Collectif ♥BOX https://opencollective.com/monnaie-libre/" > ~/.zen/tmp/palpay.bro \ && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. " ~/.zen/tmp/palpay.bro \ @@ -116,14 +114,14 @@ echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$ ## MAKE FRIENDS & SEND G1 echo "NEW PalPay Friend $ASTROMAIL TW : $ASTROTW - G1 : $ASTROG1 + G1 : ${ASTROG1} ASTROIPFS : $ASTROIPFS RSS : $ASTROFEED" if [[ ${ASTROG1} != ${G1PUB} ]]; then ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${SHARE} -p ${ASTROG1} -c "PalPay:$N:$IPUBKEY" -m > /dev/null 2>&1 + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${SHARE} -p ${ASTROG1} -c "G1PalPay:$N:$IPUBKEY" -m > /dev/null 2>&1 STAMP=$? else @@ -171,12 +169,12 @@ echo "******************TIDDLERS with EMAIL in TAGS treatment" while read LINE; do echo "---------------------------------- PalPé mec" - echo "$LINE" + echo "${LINE}" echo "---------------------------------- PalPAY for Tiddler" - TCREATED=$(echo $LINE | jq -r .created) - TTITLE=$(echo $LINE | jq -r .title) - TTAGS=$(echo $LINE | jq -r .tags) - TOPIN=$(echo $LINE | jq -r .ipfs) + TCREATED=$(echo ${LINE} | jq -r .created) + TTITLE=$(echo ${LINE} | jq -r .title) + TTAGS=$(echo ${LINE} | jq -r .tags) + TOPIN=$(echo ${LINE} | jq -r .ipfs) echo "$TTITLE" @@ -193,7 +191,7 @@ while read LINE; do ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" #### SEARCH FOR PALPAY ACOUNTS : TODO BETTER §§§ $($MY_PATH/../tools/search_for_this_email_in_players.sh ${ZMAIL}) ## export ASTROTW and more -echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS" +echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" if [[ ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then diff --git a/README.md b/README.md index 95c484bc..ff1d9402 100644 --- a/README.md +++ b/README.md @@ -44,15 +44,15 @@ bash <(wget -qO- https://raw.githubusercontent.com/papiche/Astroport.ONE/master/ Si tout s'est bien déroulé, vous devriez trouver ces processus en cours d'execution... ``` -fred 1113122 50.5 0.9 824512 72512 ? Ssl 18:00 0:01 /usr/local/bin/ipfs daemon --enable-pubsub-experiment --enable-namesy -fred 1113040 0.0 0.0 6688 3076 ? Ss 17:59 0:00 /bin/bash /home/fred/.zen/G1BILLET/G1BILLETS.sh daemon -fred 1113074 0.0 0.0 6688 1492 ? S 17:59 0:00 \_ /bin/bash /home/fred/.zen/G1BILLET/G1BILLETS.sh daemon -fred 1113076 0.0 0.0 2980 840 ? S 17:59 0:00 \_ nc -l -p 33101 -q 1 -fred 1112771 0.0 0.0 6944 3312 ? Ss 17:57 0:00 /bin/bash /home/fred/.zen/Astroport.ONE/12345.sh -fred 1112935 0.0 0.0 6944 1668 ? S 17:57 0:00 \_ /bin/bash /home/fred/.zen/Astroport.ONE/12345.sh -fred 1112937 0.0 0.0 2980 784 ? S 17:57 0:00 \_ nc -l -p 1234 -q 1 -fred 29101 0.0 0.0 6820 1880 ? S Mar26 0:00 /bin/bash /home/fred/.zen/Astroport.ONE/_12345.sh -fred 1080385 0.0 0.0 2980 896 ? S Apr22 0:00 \_ nc -l -p 12345 -q 1 +/usr/local/bin/ipfs daemon --enable-pubsub-experiment --enable-namesy +/bin/bash /home/fred/.zen/G1BILLET/G1BILLETS.sh daemon + \_ /bin/bash /home/fred/.zen/G1BILLET/G1BILLETS.sh daemon + \_ nc -l -p 33101 -q 1 +/bin/bash /home/fred/.zen/Astroport.ONE/12345.sh + \_ /bin/bash /home/fred/.zen/Astroport.ONE/12345.sh + \_ nc -l -p 1234 -q 1 +/bin/bash /home/fred/.zen/Astroport.ONE/_12345.sh + \_ nc -l -p 12345 -q 1 ``` diff --git a/templates/register.html b/templates/register.html index c833602c..90fcd947 100644 --- a/templates/register.html +++ b/templates/register.html @@ -162,8 +162,8 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable