geoloc-script: remove empty lines with comma...
This commit is contained in:
parent
0b449b4898
commit
f2c19fb680
|
@ -4,7 +4,7 @@
|
||||||
GPATH="$( cd "$(dirname "$0")" ; pwd -P )/.."
|
GPATH="$( cd "$(dirname "$0")" ; pwd -P )/.."
|
||||||
[[ ! -f $GPATH/.env ]] && cp $GPATH/.env.example $GPATH/.env
|
[[ ! -f $GPATH/.env ]] && cp $GPATH/.env.example $GPATH/.env
|
||||||
source $GPATH/.env
|
source $GPATH/.env
|
||||||
timeout=120
|
timeout=320
|
||||||
startLoop=$(date +%s)
|
startLoop=$(date +%s)
|
||||||
|
|
||||||
echo "### $(date +%d-%m-%y) ###"
|
echo "### $(date +%d-%m-%y) ###"
|
||||||
|
@ -34,7 +34,7 @@ IFS=$'\n';
|
||||||
j=0
|
j=0
|
||||||
for i in $DATA_MBR; do
|
for i in $DATA_MBR; do
|
||||||
IFS=$oldIFS
|
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 }')
|
pubkey=$(echo $i | awk '{ print $1 }')
|
||||||
userId=\"$(echo $i | awk '{ print $2 }')\"
|
userId=\"$(echo $i | awk '{ print $2 }')\"
|
||||||
result=$(timeout $timeout $JAKLIS get -p $pubkey)
|
result=$(timeout $timeout $JAKLIS get -p $pubkey)
|
||||||
|
@ -59,7 +59,7 @@ echo "Start non membres loop"
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
for i in $DATA_NONMBR; do
|
for i in $DATA_NONMBR; do
|
||||||
IFS=$oldIFS
|
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 }')
|
pubkey=$(echo $i | awk '{ print $1 }')
|
||||||
userId=\"$(echo $i | awk '{ print $2 }')\"
|
userId=\"$(echo $i | awk '{ print $2 }')\"
|
||||||
result=$(timeout $timeout $JAKLIS get -p $pubkey)
|
result=$(timeout $timeout $JAKLIS get -p $pubkey)
|
||||||
|
@ -82,7 +82,7 @@ done
|
||||||
echo "Start larfeuil loop"
|
echo "Start larfeuil loop"
|
||||||
|
|
||||||
for i in $DATA_LARF; do
|
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)
|
result=$(timeout $timeout $JAKLIS get -p $i)
|
||||||
[[ $? -eq 124 ]] && echo "timeout $i" && continue
|
[[ $? -eq 124 ]] && echo "timeout $i" && continue
|
||||||
geoPoint=$(echo "$result" | jq .geoPoint 2>/dev/null)
|
geoPoint=$(echo "$result" | jq .geoPoint 2>/dev/null)
|
||||||
|
@ -108,7 +108,7 @@ echo "}" >> $FILE
|
||||||
|
|
||||||
echo "Parse end result with jq"
|
echo "Parse end result with jq"
|
||||||
|
|
||||||
finalResult=$(cat $FILE | jq .)
|
finalResult=$(cat $FILE | sed "/^,/Id" | jq .)
|
||||||
RESULT=$?
|
RESULT=$?
|
||||||
|
|
||||||
if [ $RESULT -eq 0 ]; then
|
if [ $RESULT -eq 0 ]; then
|
||||||
|
|
Loading…
Reference in New Issue