diff --git a/12345.sh b/12345.sh index 35502650..abfb0736 100755 --- a/12345.sh +++ b/12345.sh @@ -232,7 +232,7 @@ sed -i "s~.000.~.$(printf '%03d' $(echo ${RANDOM} % 18 | bc)).~g" ~/.zen/tmp/cou ) & end=`date +%s` - echo " (☓‿‿☓) Execution time was "`expr $end - $start` seconds. + echo " Messaging launch (☓‿‿☓) Execution time was "`expr $end - $start` seconds. continue fi ######################## MESSAGING END @@ -262,7 +262,8 @@ sed -i "s~.000.~.$(printf '%03d' $(echo ${RANDOM} % 18 | bc)).~g" ~/.zen/tmp/cou ######################################## ######################################## if [[ "$APPNAME" == "testcraft" ]]; then - ( # SUB PROCESS + ( # testcraft SUB PROCESS + start=`date +%s` ## RECORD DATA MADE IN BROWSER (JSON) SALT=$(urldecode ${arr[1]} | xargs) PEPPER=$(urldecode ${arr[3]} | xargs) @@ -348,6 +349,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh ## REPONSE ON IPFSNODEID ( + start=`date +%s` echo "¯\_༼༽_/¯ $IPFSNODEID $PLAYER SIGNALING" ROUTING=$(ipfs add -rwq ~/.zen/tmp/${IPFSNODEID}/* | tail -n 1 ) ipfs name publish --allow-offline /ipfs/$ROUTING @@ -358,7 +360,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh end=`date +%s` echo "(|$APPNAME|) Execution time was "`expr $end - $start` seconds. - ) & + ) & # testcraft SUB PROCESS end=`date +%s` echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds. @@ -390,7 +392,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh # # CRYPTO DECODING CRYPTIP -> myIP rm -f ~/.zen/tmp/myIP.2 - echo "$CRYPTIP" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + echo "$CRYPTIP" > ~/.zen/tmp/myIP.$G1PUB.enc.2 $MY_PATH/tools/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.2 > /dev/null 2>&1 OLDIP=$(cat ~/.zen/tmp/myIP.2 > /dev/null 2>&1) diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index b26465b8..0f90fbe3 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -85,7 +85,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( # # CRYPTO DECODING CRYPTIP -> myIP rm -f ~/.zen/tmp/myIP.2 - echo "$CRYPTIP" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + echo "$CRYPTIP" > ~/.zen/tmp/myIP.$G1PUB.enc.2 $MY_PATH/../tools/natools.py decrypt -f pubsec -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.2 > /dev/null 2>&1 OLDIP=$(cat ~/.zen/tmp/myIP.2 > /dev/null 2>&1) diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index 6fcea696..b152cfb7 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -54,7 +54,7 @@ if [[ ! -d ~/.zen/game/players/${PLAYER}/FRIENDS/ ]]; then ######################################################################## echo "UPDATE ${PLAYER} GCHANGE+ PROFILE" ######################################################################## - echo $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" set -n "${NAME}" -d "${DESCR}" -v "${VILLE}" -a "${ADRESSE}" -s "http://tube.copylaradio.com:8080/ipns/$ASTRONAUTENS" #GCHANGE+ + $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" set -n "${NAME}" -d "${DESCR}" -v "${VILLE}" -a "${ADRESSE}" -s "http://tube.copylaradio.com:8080/ipns/$ASTRONAUTENS" #GCHANGE+ [[ ! $? == 0 ]] && echo "GCHANGE PROFILE CREATION FAILED" ## GET CESIUM diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 5e420005..68faa603 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -206,13 +206,13 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) echo "# CRYPTO ENCODING myIP -> CRYPTIP" echo $myIP > ~/.zen/tmp/myIP $MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/myIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc - CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base64) + CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc) sed -i "s~_SECRET_~$CRYPTIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # echo "# CRYPTO DECODING CRYPTIP -> myIP" tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' CRYPTIP2=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret) - echo "$CRYPTIP2" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + echo "$CRYPTIP2" > ~/.zen/tmp/myIP.$G1PUB.enc.2 rm -f ~/.zen/tmp/myIP.2 echo "$MY_PATH/natools.py decrypt -f pubsec -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -i $HOME/.zen/tmp/myIP.$G1PUB.enc.2 -o $HOME/.zen/tmp/myIP.2" $MY_PATH/natools.py decrypt -f pubsec -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -i $HOME/.zen/tmp/myIP.$G1PUB.enc.2 -o $HOME/.zen/tmp/myIP.2