Try to fix issue #2, tricky since I can't reproduce it locally

This commit is contained in:
Michael Moon
2022-06-07 16:57:46 +08:00
parent 74626ea240
commit 14e28a8e76

View File

@@ -158,13 +158,13 @@ if ! [ -r "$DATAFILE_NEW" ]
then then
echo "Fetching new generation server list from PIA" echo "Fetching new generation server list from PIA"
curl --max-time 15 'https://serverlist.piaservers.net/vpninfo/servers/v6' -o "$DATAFILE_NEW.temp" || exit 1 curl --max-time 15 'https://serverlist.piaservers.net/vpninfo/servers/v6' -o "$DATAFILE_NEW.temp" || exit 1
if [ "$(jq '.regions | map_values(select(.servers.wg)) | keys' "$DATAFILE_NEW.temp" 2>/dev/null | wc -l)" -le 30 ] if [ "$(head -n1 < "$DATAFILE_NEW.temp" | jq '.regions | map_values(select(.servers.wg)) | keys' 2>/dev/null | wc -l)" -le 30 ]
then then
echo "Bad serverlist retrieved to $DATAFILE_NEW.temp, exiting" echo "Bad serverlist retrieved to $DATAFILE_NEW.temp, exiting"
echo "You can try again if there was a transient error" echo "You can try again if there was a transient error"
exit 1 exit 1
else else
jq -cM '.' "$DATAFILE_NEW.temp" > "$DATAFILE_NEW" 2>/dev/null head -n1 < "$DATAFILE_NEW.temp" | jq -cM '.' > "$DATAFILE_NEW" 2>/dev/null
fi fi
fi fi