diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index 7c7028bb..ebcbe590 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -295,11 +295,12 @@ if [[ ${wishnumbers} -gt 0 ]]; then --output ~/.zen/tmp/${MOATS} \ --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap) + [[ $TWMAPNS == "null" || $TWMAPNS == "" ]] && TWMAPNS="/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu" LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat) - [[ ${LAT} == "null" ]] && LAT="0.00" + [[ ${LAT} == "null" || ${LAT} == "" ]] && LAT="0.00" LAT=$(makecoord $LAT) LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon) - [[ ${LON} == "null" ]] && LON="0.00" + [[ ${LON} == "null" || ${LON} == "" ]] && LON="0.00" LON=$(makecoord $LON) echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}" rm ~/.zen/tmp/${MOATS}/GPS.json diff --git a/tools/COINScheck.sh b/tools/COINScheck.sh index 145cb0fd..feda06d2 100755 --- a/tools/COINScheck.sh +++ b/tools/COINScheck.sh @@ -48,9 +48,11 @@ fi mkdir -p $HOME/.zen/tmp/coucou/ COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS - +####################################################### ## GET EXTERNAL G1 DATA ${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB} +####################################################### +####################################################### # echo "ACTUAL $COINSFILE CONTAINS" CURCOINS=$(cat $COINSFILE 2>/dev/null) diff --git a/tools/GetGCAttributesFromG1PUB.sh b/tools/GetGCAttributesFromG1PUB.sh index fcd69ce2..49dcd31f 100755 --- a/tools/GetGCAttributesFromG1PUB.sh +++ b/tools/GetGCAttributesFromG1PUB.sh @@ -40,9 +40,9 @@ fi ## SCAN GCHANGE + if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.gchange.json ]]; then ${MY_PATH}/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json - GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '.found') + GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json 2>/dev/null | jq -r '.found') - if [[ $GFOUND == "false" ]]; then + if [[ ! $GFOUND || $GFOUND == "false" ]]; then echo "-- NO GCHANGE " else cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ~/.zen/tmp/coucou/ @@ -57,9 +57,9 @@ fi if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cesium.json ]]; then ${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null - GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json | jq -r '.found') + GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null | jq -r '.found') - if [[ $GCFOUND == "false" ]]; then + if [[ ! $GCFOUND || $GCFOUND == "false" ]]; then echo "-- NO CESIUM" else cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ~/.zen/tmp/coucou/