diff --git a/API/SALT.sh b/API/SALT.sh index 04dcbc9b..43c5767a 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -242,8 +242,8 @@ if [[ "$APPNAME" == "testcraft" ]]; then ## TODO : modify timeout if isLAN or NOT [[ $isLAN ]] && WAIT=3 || WAIT=12 - echo "1ST TRY : ipfs --timeout ${WAIT}s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT}" - ipfs --timeout ${WAIT}s cat /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT} + echo "1ST TRY : ipfs --timeout ${WAIT}s cat --progress=false /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT}" + ipfs --timeout ${WAIT}s cat --progress=false /ipfs/$DATAID > ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT} echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh diff --git a/RUNTIME/G1Voeu.sh b/RUNTIME/G1Voeu.sh index 8c6d68fb..0d0838c7 100755 --- a/RUNTIME/G1Voeu.sh +++ b/RUNTIME/G1Voeu.sh @@ -78,7 +78,7 @@ ENCODING=$(cat $HOME/.zen/tmp/${MOATS}/qrtw.ipfskey.$G1PUB.enc | base16) #~ echo $ENCODING ## TEST IPFS -#~ ipfs --timeout=30s cat /ipns/${VOEUNS} > ~/.zen/tmp/${VOEUNS}.json +#~ ipfs --timeout=30s cat --progress=false /ipns/${VOEUNS} > ~/.zen/tmp/${VOEUNS}.json #~ [[ -s ~/.zen/tmp/${VOEUNS}.json ]] \ #~ && echo "HEY !!! UN CHANNEL EXISTE DEJA POUR CE VOEU ! ~/.zen/tmp/${VOEUNS}.json - EXIT -" \ #~ && exit 1 diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index b4f9e13e..841bab8f 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -351,7 +351,7 @@ for PLAYER in ${PLAYERONE[@]}; do fi ( ## REFRESH LOCAL PLAYER CACHE with FRIEND ACTUAL TW (&) will be used TOMORROW - ipfs --timeout 480s cat --progress=false ${FTW} > ~/.zen/game/players/${PLAYER}/FRIENDS/${FPLAYER}/index.html + ipfs --timeout 480s cat --progress="false" ${FTW} > ~/.zen/game/players/${PLAYER}/FRIENDS/${FPLAYER}/index.html ) & ## UPDATE IF IHASH CHANGED -> New drawing => Friend get informed diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 6eb0bda1..b1e3a428 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -54,7 +54,7 @@ if [[ $SALT != "" && PEPPER != "" ]]; then echo "SCANNING /ipns/${ASTRONAUTENS} for 180s" ## GETTING LAST TW via IPFS or HTTP GW - ipfs --timeout 180s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/TW/index.html + ipfs --timeout 180s cat --progress=false /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/TW/index.html if [[ -s ~/.zen/tmp/${MOATS}/TW/index.html ]]; then echo "TW FOUND... BACKUP TIDDLERS" diff --git a/ajouter_media.sh b/ajouter_media.sh index 39ad4489..ab6515e9 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -849,7 +849,9 @@ if [[ -s ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; t ## GETTING LAST TW via IPFS or HTTP GW LIBRA=$(head -n 2 ${MY_PATH}/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2) rm -f ~/.zen/tmp/astronaut_TW.html > /dev/null 2>&1 - [[ $YOU ]] && echo " ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/astronaut_TW.html + [[ $YOU ]] \ + && echo " ipfs --timeout 120s cat --progress=false /ipns/${ASTRONAUTENS} ($YOU)" \ + && ipfs --timeout 120s cat --progress=false /ipns/${ASTRONAUTENS} > ~/.zen/tmp/astronaut_TW.html #~ [[ ! -s ~/.zen/tmp/astronaut_TW.html ]] && echo "curl -m 12 $LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/astronaut_TW.html "$LIBRA/ipns/${ASTRONAUTENS}" [[ ! -s ~/.zen/tmp/astronaut_TW.html ]] && espeak "WARNING. WARNING. impossible to find your TW online" [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] && espeak "FATAL ERROR. No player TW copy found ! EXIT" && exit 1 diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index 70ba61f5..5a596799 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -253,8 +253,8 @@ do [[ $YOU ]] \ - && echo "ipfs --timeout 120s cat /ipns/${FRIENDNS} > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html" \ - && ipfs --timeout 120s cat /ipns/${FRIENDNS} > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html + && echo "ipfs --timeout 120s cat --progress=false /ipns/${FRIENDNS} > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html" \ + && ipfs --timeout 120s cat --progress=false /ipns/${FRIENDNS} > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html [[ ! -s ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html ]] \ && echo "curl -m 120 -so ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}/index.html $LIBRA/ipns/${FRIENDNS}" \ diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh index 7d1f6f21..e888affb 100755 --- a/tools/TW.cache.sh +++ b/tools/TW.cache.sh @@ -17,8 +17,8 @@ if [[ ${IPFSNODEID} == "" ]]; then IPFSNODEID=$(ipfs --timeout 12s id -f='\n') fi ## GETTING LAST TW via IPFS - echo "${ME} : IPFS : ipfs --timeout 120s cat /ipns/${ASTRONAUTENS}"\ - && ipfs --timeout 360s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html + echo "${ME} : IPFS : ipfs --timeout 120s cat --progress=false /ipns/${ASTRONAUTENS}"\ + && ipfs --timeout 360s cat --progress=false /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ## GETTING LAST TW via HTTP #~ [[ ! -s ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ]] \ diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index deb3b154..dbccdc66 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -48,11 +48,20 @@ espeak "Hello" if [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.pubkey ]]; then espeak "Getting player latest TW. please wait." ## GETTING LAST TW via IPFS or HTTP GW - [[ $YOU ]] && echo "$myIPFS/ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 12s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/vlc_webcam.html - [[ ! -s ~/.zen/tmp/vlc_webcam.html ]] && echo "$LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/vlc_webcam.html "$LIBRA/ipns/${ASTRONAUTENS}" - [[ ! -s ~/.zen/tmp/vlc_webcam.html ]] && espeak "WARNING. impossible to find your TW online" - [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] && espeak "FATAL ERROR. No local copy found !" && exit 1 - [[ -s ~/.zen/tmp/vlc_webcam.html ]] && cp -f ~/.zen/tmp/vlc_webcam.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html && espeak "OK DONE" + [[ $YOU ]] \ + && echo "$myIPFS/ipns/${ASTRONAUTENS} ($YOU)" \ + && ipfs --timeout 12s cat --progress=false /ipns/${ASTRONAUTENS} > ~/.zen/tmp/vlc_webcam.html + [[ ! -s ~/.zen/tmp/vlc_webcam.html ]] \ + && echo "$LIBRA/ipns/${ASTRONAUTENS}" \ + && curl -m 12 -so ~/.zen/tmp/vlc_webcam.html "$LIBRA/ipns/${ASTRONAUTENS}" + [[ ! -s ~/.zen/tmp/vlc_webcam.html ]] \ + && espeak "WARNING. impossible to find your TW online" + [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] \ + && espeak "FATAL ERROR. No local copy found !" \ + && exit 1 + [[ -s ~/.zen/tmp/vlc_webcam.html ]] \ + && cp -f ~/.zen/tmp/vlc_webcam.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ + && espeak "OK DONE" fi espeak "Start Video recording. Press ENTER to stop !" # Find "input-slave" :: pactl list short sources