kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #472 from konimex/master

Browse source 
Public IP: Add caching
This commit is contained in:
Dylan Araps 2016-12-02 16:23:09 +11:00 committed by GitHub
commit 8bb7524b95
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
neofetch
View file

@ -1738,18 +1738,30 @@ get_local_ip() {
} }
get_public_ip() { get_public_ip() {
if type -p dig >/dev/null; then # Use cache if available
public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)" if [[ -f "/tmp/neofetch/public_ip" ]]; then
[[ "$public_ip" =~ ^\; ]] && unset public_ip source "/tmp/neofetch/public_ip"
elif [[ -f "/Library/Caches/neofetch/public_ip" ]]; then
source "/Library/Caches/neofetch/public_ip"
else
if type -p dig >/dev/null; then
public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)"
[[ "$public_ip" =~ ^\; ]] && unset public_ip
fi
if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then
public_ip="$(curl --max-time 10 -w '\n' "$public_ip_host")"
fi
if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then
public_ip="$(wget -T 10 -qO- "$public_ip_host")"
fi
fi fi
if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then case "$os" in
public_ip="$(curl --max-time 10 -w '\n' "$public_ip_host")" "Mac OS X"*) cache "public_ip" "$public_ip" "/Library/Caches" ;;
fi *) cache "public_ip" "$public_ip" "/tmp" ;;
esac
if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then
public_ip="$(wget -T 10 -qO- "$public_ip_host")"
fi
} }
get_users() { get_users() {