sqrtminusone/dotfiles
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/dotfiles.git synced 2025-12-11 19:45:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ipstack-vpn): do not err on wrong JSON from API

Browse source
This commit is contained in:
Pavel Korytov 2021-10-28 15:48:50 +03:00
parent 770a2421a6
commit 0dc4420ecc
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Desktop.org
View file

@ -993,9 +993,13 @@ if [[ -z $ip || $ip == *"timed out"* ]]; then
fi fi
ip_info=$(curl -s http://api.ipstack.com/${ip}?access_key=${API_KEY}) ip_info=$(curl -s http://api.ipstack.com/${ip}?access_key=${API_KEY})
# emoji=$(echo $ip_info | jq -r '.location.country_flag_emoji') # emoji=$(echo $ip_info | jq -r '.location.country_flag_emoji')
code=$(echo $ip_info | jq -r '.country_code') code=$(echo $ip_info | jq -r '.country_code' 2> /dev/null)
vpn=$(pgrep -a openvpn$ | head -n 1 | awk '{print $NF }' | cut -d '.' -f 1) vpn=$(pgrep -a openvpn$ | head -n 1 | awk '{print $NF }' | cut -d '.' -f 1)
if [[ -z $code ]]; then
code="??"
fi
if [ -n "$vpn" ]; then if [ -n "$vpn" ]; then
echo "%{u<<get-color(name="blue")>>}%{+u}  $code %{u-}" echo "%{u<<get-color(name="blue")>>}%{+u}  $code %{u-}"
else else

6
bin/polybar/ipstack-vpn.sh
View file

@ -9,9 +9,13 @@ if [[ -z $ip || $ip == *"timed out"* ]]; then
fi fi
ip_info=$(curl -s http://api.ipstack.com/${ip}?access_key=${API_KEY}) ip_info=$(curl -s http://api.ipstack.com/${ip}?access_key=${API_KEY})
# emoji=$(echo $ip_info | jq -r '.location.country_flag_emoji') # emoji=$(echo $ip_info | jq -r '.location.country_flag_emoji')
code=$(echo $ip_info | jq -r '.country_code') code=$(echo $ip_info | jq -r '.country_code' 2> /dev/null)
vpn=$(pgrep -a openvpn$ | head -n 1 | awk '{print $NF }' | cut -d '.' -f 1) vpn=$(pgrep -a openvpn$ | head -n 1 | awk '{print $NF }' | cut -d '.' -f 1)
if [[ -z $code ]]; then
code="??"
fi
if [ -n "$vpn" ]; then if [ -n "$vpn" ]; then
echo "%{u#82aaff}%{+u}  $code %{u-}" echo "%{u#82aaff}%{+u}  $code %{u-}"
else else