axiom-team
/
g1-stats
7
1
Fork 1
Code Issues Pull Requests Releases Activity

geoloc-script: remove empty lines with comma...

This commit is contained in:
poka 2023-03-15 12:13:29 +01:00
parent 0b449b4898
commit f2c19fb680
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/geoloc-members-json.sh
View File

@ -4,7 +4,7 @@
GPATH="$( cd "$(dirname "$0")" ; pwd -P )/.."
[[ ! -f $GPATH/.env ]] && cp $GPATH/.env.example $GPATH/.env
source $GPATH/.env
timeout=120
timeout=320
startLoop=$(date +%s)
echo "### $(date +%d-%m-%y) ###"
@ -34,7 +34,7 @@ IFS=$'\n';
j=0
for i in $DATA_MBR; do
IFS=$oldIFS
[[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
# [[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
pubkey=$(echo $i | awk '{ print $1 }')
userId=\"$(echo $i | awk '{ print $2 }')\"
result=$(timeout $timeout $JAKLIS get -p $pubkey)
@ -59,7 +59,7 @@ echo "Start non membres loop"
IFS=$'\n'
for i in $DATA_NONMBR; do
IFS=$oldIFS
[[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
# [[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
pubkey=$(echo $i | awk '{ print $1 }')
userId=\"$(echo $i | awk '{ print $2 }')\"
result=$(timeout $timeout $JAKLIS get -p $pubkey)
@ -82,7 +82,7 @@ done
echo "Start larfeuil loop"
for i in $DATA_LARF; do
[[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
# [[ $((`date +%s`-$startLoop)) -ge 72000 ]] && echo "ERROR: spent more than 20h ... exit." && exit 1
result=$(timeout $timeout $JAKLIS get -p $i)
[[ $? -eq 124 ]] && echo "timeout $i" && continue
geoPoint=$(echo "$result" | jq .geoPoint 2>/dev/null)
@ -108,7 +108,7 @@ echo "}" >> $FILE
echo "Parse end result with jq"
finalResult=$(cat $FILE | jq .)
finalResult=$(cat $FILE | sed "/^,/Id" | jq .)
RESULT=$?
if [ $RESULT -eq 0 ]; then