diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 5f36cd6e..6312db46 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -202,7 +202,7 @@ for PLAYER in ${PLAYERONE[@]}; do SECTOR="_${LAT::-1}_${LON::-1}" ## UMAP TODATENS ################ - ipfs key rm "temp" 1>&2>/dev/null + ipfs key rm "temp" >/dev/null 2>&1 ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}" UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey) @@ -215,7 +215,7 @@ for PLAYER in ${PLAYERONE[@]}; do echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}" ## SECTOR TODATENS ################ - ipfs key rm "temp" 1>&2>/dev/null + ipfs key rm "temp" >/dev/null 2>&1 ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}" TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey) @@ -234,7 +234,7 @@ for PLAYER in ${PLAYERONE[@]}; do #~ cat ~/.zen/tmp/${MOATS}/GPS.json echo "SECTOR $SECTOR SECTORTW=/ipns/${TODATESECTORNS}/TW" - ipfs key rm "temp" 1>&2>/dev/null + ipfs key rm "temp" >/dev/null 2>&1 ## STORE IN PLAYER CACHE echo "_${LAT}_${LON}" > ~/.zen/game/players/${PLAYER}/.umap diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 3b1a89f2..1d1e3fb0 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -186,12 +186,12 @@ for SECTOR in ${SECTORS[@]}; do sed -i "s~_SECTOR_~${SECTOR}~g" ${INDEX} ## GET ALL TWs in that SECTOR - mkdir ~/.zen/tmp/${MOATS}/${SECTOR}/TWs + mkdir ~/.zen/tmp/${MOATS}/${SECTOR}/TWZ cp -rf ~/.zen/tmp/swarm/12D*/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/TW/* \ - ~/.zen/tmp/${MOATS}/${SECTOR}/TWs/ + ~/.zen/tmp/${MOATS}/${SECTOR}/TWZ cp -rf ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/TW/* \ - ~/.zen/tmp/${MOATS}/${SECTOR}/TWs/ + ~/.zen/tmp/${MOATS}/${SECTOR}/TWZ ## GET ALL RSS json's AND Feed SECTOR TW with it RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/RSS/*.rss.json 2>/dev/null)) @@ -240,8 +240,8 @@ for SECTOR in ${SECTORS[@]}; do " > ~/.zen/tmp/world.js floop=1 - SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null)) - NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null)) + SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/TW/*/index.html 2>/dev/null)) + NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/TW/*/index.html 2>/dev/null)) TWFILES=("${SWARMTW[@]}" "${NODETW[@]}") for TWRED in ${TWFILES[@]}; do diff --git a/ajouter_media.sh b/ajouter_media.sh index e54ee070..5ef2279a 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -32,7 +32,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized # REMOVE GtkDialog errors for zenity shopt -s expand_aliases alias zenity='zenity 2> >(grep -v GtkDialog >&2)' -alias espeak='espeak 1>&2>/dev/null' +alias espeak='espeak >/dev/null 2>&1' ## CHECK IF IPFS DAEMON IS STARTS WELL floop=0 @@ -71,7 +71,7 @@ if [[ ${PLAYER} == "" ]]; then players=($(ls ~/.zen/game/players | grep "@" 2>/dev/null)) if [[ ${#players[@]} -ge 1 ]]; then - espeak "SELECT YOUR PLAYER" 2>/dev/null + espeak "SELECT YOUR PLAYER" OUTPUT=$(zenity --list --width 480 --height 200 --title="Choix du PLAYER" --column="Astronaute" "${players[@]}") [[ ${OUTPUT} == "" ]] && espeak "No player selected. EXIT" && exit 1 else