diff --git a/12345.sh b/12345.sh index fdfa612c..edfda6fb 100755 --- a/12345.sh +++ b/12345.sh @@ -24,7 +24,7 @@ mkdir -p ~/.zen/tmp/123/ ncrunning=$(ps auxf --sort=+utime | grep -w 'nc -l -p 1234' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) [[ $ncrunning ]] && echo "ERROR - API Server Already Running - http://$myIP:1234/?salt=toto&pepper=toto " && exit 1 -echo "LAUNCHING Astroport API Server - http://$myIP:1234/?salt=toto&pepper=toto&messaging" +echo "LAUNCHING Astroport API Server - http://$myIP:1234/?salt=toto&pepper=toto&official" # [[ $DISPLAY ]] && xdg-open "file://$HOME/.zen/Astroport.ONE/templates/instascan.html" 2>/dev/null # [[ $DISPLAY ]] && xdg-open "http://$myIP:1234" 2>/dev/null @@ -173,12 +173,14 @@ cat ~/.zen/tmp/123/${MOATS}.messaging.json >> ~/.zen/tmp/123/${MOATS}.index.redi [[ $YOU ]] && ipfs --timeout 12s cat /ipns/$GNS > ~/.zen/tmp/123/${MOATS}.astroindex.html \ || curl -m 12 -so ~/.zen/tmp/123/${MOATS}.astroindex.html "$LIBRA/ipns/$GNS" - echo "~/.zen/tmp/123/${MOATS}.astroindex.html" + # DEBUG + echo "tiddlywiki --load ~/.zen/tmp/123/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion'" + echo "cat ~/.zen/tmp/miz.json | jq -r .[].secret" if [[ -s ~/.zen/tmp/123/${MOATS}.astroindex.html ]]; then tiddlywiki --load ~/.zen/tmp/123/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' OLDIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret) - [[ ! $OLDIP ]] && (echo "ERROR - NO IP - BAD TW - CONTINUE " | nc -l -p ${PORT} -q 1 &) && continue + [[ ! $OLDIP ]] && (echo "ERROR - $OLDIP WRONG TW - CONTINUE " | nc -l -p ${PORT} -q 1 &) && continue # FIRST TIME PLAYER TW USING GATEWAY if [[ $OLDIP == "_SECRET_" ]]; then echo "_SECRET_ TW PUSHING TW" diff --git a/start.sh b/start.sh index 5d58e508..3417942c 100755 --- a/start.sh +++ b/start.sh @@ -12,7 +12,12 @@ ME="${0##*/}" TS=$(date -u +%s%N | cut -b1-13) MOATS=$(date -u +"%Y%m%d%H%M%S%4N") +################################################### killall 12345.sh; killall nc; killall tail +~/.zen/Astroport.ONE/12345.sh > ~/.zen/tmp/12345.log & +tail -f ~/.zen/tmp/12345.log & +echo "1234 PORT SPIDER http://$myIP:1234" +################################################### echo ' _ ____ _____ ____ ___ ____ ___ ____ _____ ___ _ _ _____ @@ -35,10 +40,6 @@ YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail [[ ! $YOU ]] && echo "Lancez 'ipfs daemon' SVP sudo systemctl start ipfs" && exit 1 IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) -~/.zen/Astroport.ONE/12345.sh > ~/.zen/tmp/12345.log & -tail -f ~/.zen/tmp/12345.log & -echo "1234 PORT SPIDER http://$myIP:1234" - ## CREATE AND OR CONNECT USER PS3='Créez VISA ou connectez-vous à votre compte Astronaute ___ ' players=("NOUVEAU VISA" "IMPORT GVISA" $(ls ~/.zen/game/players 2>/dev/null))