From 2eed37ee2e122763caabedfa2ba7e618eeed01cd Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 30 Dec 2022 22:55:10 +0100 Subject: [PATCH] yuuus --- 12345.sh | 26 +++++++++++++++++++------- ASTROBOT/G1CopierYoutube.sh | 2 +- ASTROBOT/PLAYER.refresh.sh | 2 +- _12345.sh | 3 +++ templates/register.html | 2 +- tools/Connect_PLAYER_To_Gchange.sh | 18 ++++++++---------- tools/VISA.new.sh | 13 ++++++++----- 7 files changed, 41 insertions(+), 25 deletions(-) diff --git a/12345.sh b/12345.sh index 523d3b96..ffa7b2b5 100755 --- a/12345.sh +++ b/12345.sh @@ -147,6 +147,16 @@ while true; do echo "GET RECEPTION : $URL" arr=(${URL//[=&]/ }) + ##################################################################### + ### GIT PULL ?? + ##################################################################### + if [[ ${arr[0]} == "poule" ]]; then + echo "UPDATING CODE git pull > ~/.zen/tmp/.lastpull" + echo "$HTTPCORS" > ~/.zen/tmp/.lastpull + git pull >> ~/.zen/tmp/.lastpull + (cat ~/.zen/tmp/.lastpull | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue + fi + # CHECK APPNAME APPNAME=$(urldecode ${arr[4]} | xargs) WHAT=$(urldecode ${arr[5]} | xargs) @@ -154,6 +164,7 @@ while true; do OBJ=$(urldecode ${arr[6]} | xargs) VAL=$(urldecode ${arr[7]} | xargs) + ########## CHECK GET PARAM NAMES ################################################################################################### [[ ${arr[0]} == "" || ${arr[1]} == "" ]] && (echo "$HTTPCORS ERROR - MISSING DATA" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue @@ -199,7 +210,7 @@ while true; do ( ## SUB PROCESS COINS=$($MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key balance) echo "+++ WALLET BALANCE _ $COINS (G1) _" - [[ $COINS == "" || $COINS == "null" ]] && $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -n "$myDATA" send -d "${G1PUB}" -t "BRO." -m "TAPA DE JUNE ? VA AVEC >>> https://cesium.app >>> (ᵔ◡◡ᵔ) FLASHER TON G1VISA " + [[ $COINS == "" || $COINS == "null" ]] && $MY_PATH/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key send -d "${G1PUB}" -t "BRO." -m "TAPA DE JUNE ? VA AVEC >>> https://cesium.app >>> (ᵔ◡◡ᵔ) FLASHER TON G1VISA " end=`date +%s` echo "G1WALLET (☓‿‿☓) Execution time was "`expr $end - $start` seconds. ) & @@ -535,23 +546,23 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh if [[ $WHAT =~ ^[0-9]+$ ]]; then echo "${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n $myDATA pay -a ${WHAT} -p ${VAL} -c 'Bro' -m" - ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "$myDATA" pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi if [[ "$WHAT" == "history" ]]; then sed -i "s~text/html~application/json~g" ~/.zen/tmp/$PLAYER.pay.$WHAT.http - ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "$myDATA" history -j >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -j >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi if [[ "$WHAT" == "get" ]]; then sed -i "s~text/html~application/json~g" ~/.zen/tmp/$PLAYER.pay.$WHAT.http - ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "$myDATA" get >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http - fi + ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey get >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + fi if [[ "$WHAT" == "balance" ]]; then - ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "$myDATA" balance >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http - fi + ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + fi cat ~/.zen/tmp/$PLAYER.pay.$WHAT.http cat ~/.zen/tmp/$PLAYER.pay.$WHAT.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & @@ -630,5 +641,6 @@ fi fi + done exit 0 diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index d6dc8b35..ec2c6a61 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -66,7 +66,7 @@ for YURL in $(cat ~/.zen/game/players/$PLAYER/G1CopierYoutube/CopierYoutube.json duree=$(expr ${MOATS} - $lastrun) [[ ! $lastrun ]] && echo "$PLAYER&$YURL:$MOATS" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.command && duree=604800000 # ONE WEEK NEW SCAN - if [[ duree -ge 604800000 ]]; then + if [[ duree -ge 604800000 || ! -s ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER ]]; then yt-dlp --cookies-from-browser $BROWSER --print "%(id)s&%(webpage_url)s" "${YURL}" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER sed -i "s~$lastrun~$MOATS~g" ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.command # UPDATE LASTRUN fi diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 154273b7..91c6aeb2 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -27,7 +27,7 @@ for PLAYER in ${PLAYERONE[@]}; do echo ">>>>> PLAYER : $PLAYER >>>>>>>>>>>>> REFRESHING TW STATION" echo "##################################################################" # Get PLAYER wallet amount - COINS=$($MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "$myDATA" balance) + COINS=$($MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey balance) echo "+++ WALLET BALANCE _ $COINS (G1) _" #~ ## IF WALLET IS EMPTY : WHAT TODO ? echo "##################################################################" diff --git a/_12345.sh b/_12345.sh index 230bce08..f4461f84 100755 --- a/_12345.sh +++ b/_12345.sh @@ -12,6 +12,9 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized . "${MY_PATH}/tools/my.sh" +## LOG IN +exec 2>&1 >> ~/.zen/tmp/_12345.log + PORT=12345 YOU=$(myIpfsApi); ## API of $USER running ipfs diff --git a/templates/register.html b/templates/register.html index 1ebba9ef..df33d698 100644 --- a/templates/register.html +++ b/templates/register.html @@ -51,7 +51,7 @@ header { --- Welkom - Mirë se vini - Willkommen - Welkomma - Welcome - Marhaban - Bari galoust - Xos gelmissiniz - Welkum - Ongi etorri- Swagata - Ansuf yiswen - ščyra zaprašajem - Kyo tzo pa eit - Ani kié - Dobro došli - Dagemer mat - Dobre doshŭl - Benvinguts - Ulihebisdi - Huān yíng - Karibu - Eoso eoseyo - Benvenuti - Bel bonjou - Bienvini - Dobrodošli - Velkommen - Bienvenido - Bonvenon - Tere tulemast - Gabitê - Vælkomin - Tervetuloa - Welkom - Wìllkòmme - Binvignut - Fàilte - Benvido - Croeso - Planvenguda - Mikouabô - Kalos irthate - -Eguahé porá - Baroukh habaim - ... ----