diff --git a/ASTROBOT/_ForkUPlanetZERO.sh b/ASTROBOT/_ForkUPlanetZERO.sh index cc467e6c..53807bdd 100755 --- a/ASTROBOT/_ForkUPlanetZERO.sh +++ b/ASTROBOT/_ForkUPlanetZERO.sh @@ -94,7 +94,7 @@ echo '' >> $HOME/.zen/tmp/${MOATS}/swarm.key IN16=$(cat ${JSONUPLANET} | jq -r '."${PLAYER}"') ## secret is only decrypted by wish source player [[ ${IN16} == "" || ${IN16} == "null" ]] \ - && IN16=$(cat ${JSONUPLANET} | jq -r ".secret") + && IN16=$(cat ${JSONUPLANET} | jq -r ".secret") && echo "get from secret............" if [[ ${IN16} == "" || ${IN16} == "null" ]]; then @@ -107,11 +107,12 @@ if [[ ${IN16} == "" || ${IN16} == "null" ]]; then ## THIS IS A PRIMAL TIDDLER else - + echo "VERIFICATION ${IN16}" ## DEBASE16 echo "${IN16}" | base16 -d \ > ~/.zen/tmp/${MOATS}/swarmkey.crypted + echo ">> natools.py decrypt " ## DECODING with PLAYER secret.dunikey ${MY_PATH}/../tools/natools.py decrypt \ -f pubsec \ @@ -119,6 +120,7 @@ else -i ~/.zen/tmp/${MOATS}/swarmkey.crypted \ -o ~/.zen/tmp/${MOATS}/swarmkey.decrypted + echo ">> comparing decrypted key" ## CHEK KEY WITH ACTUAL ONE [[ $(diff ~/.zen/tmp/${MOATS}/swarmkey.decrypted $HOME/.zen/game/players/${PLAYER}/.ipfs/${UPNAME}.swarm.key) ]] \ && echo "- 📸 WARNING 📸 - UPDATING ${UPNAME}.swarm.key ..." && ERR="TW SWARM CHANGED" @@ -278,6 +280,10 @@ cat ${JSONUPLANET} | jq '. | ."secret" = "_SECRET_"' > ~/.zen/tmp/${MOATS}/json. && sed -i 's/_SECRET_/'"$ENCODING"'/g' ~/.zen/tmp/${MOATS}/json.up \ && mv ~/.zen/tmp/${MOATS}/json.up ${JSONUPLANET} +jq '.[] + {created: $MOATS, modified: $MOATS}' --arg MOATS "$MOATS" "${JSONUPLANET}" > ~/.zen/tmp/${MOATS}/json.up \ + && mv ~/.zen/tmp/${MOATS}/json.up ${JSONUPLANET} + + ### PUT BACK IN TW tiddlywiki --load ${INDEX} \ --import ${JSONUPLANET} "application/json" \ diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 2a966729..02f746ab 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -572,7 +572,7 @@ for PLAYER in ${PLAYERONE[@]}; do

🔋WARNING

" > ~/.zen/tmp/alert echo "

${PLAYER} TW 🔌📺

🌥 $ZEN ZEN 🌥 " >> ~/.zen/tmp/alert - ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert "TW ALERT" + ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert "TW ZEN ALERT" echo "<<<< PLAYER TW WARNING <<<< ${DIFF_SECONDS} > ${days} days" fi if [[ ${days} -gt 29 ]]; then diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index dbccdc66..384084b7 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -79,7 +79,8 @@ echo "Press ENTER to stop video recording" kill -15 $processid # cvlc v4l2:///dev/video0:width=640:height=480 --input-slave=pulse://alsa_input.usb-HD_Web_Camera_HD_Web_Camera_Ucamera001-02.analog-mono --sout '#transcode{acodec=mpga,ab=128,channels=2,samplerate=44100,threads=4,audio-sync=1}:standard{access=file,mux=mp4,dst='~/.zen/tmp/MyVid.mp4'}' --run-time=$RECTIME --stop-time=$RECTIME cvlc://quit -## RECOMMANCER ? +## RECOMMENCER ? +sleep 3 espeak "video transcoding" #-acodec aac # Ecran vert : ffmpeg -i input.mp4 -i greenscreen.mp4 -filter_complex '[1:v]colorkey=color=00FF00:similarity=0.85:blend=0.0[ckout];[0:v][ckout]overlay[out]' -map '[out]' output.mp4