EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #205 from dylanaraps/publicip 

Changes to the public ip function
This commit is contained in:
Dylan Araps 2016-03-31 19:45:04 +11:00
parent 7672ba168f 44b9e5186b
commit 88decbda2e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
1.6.md
View File

@ -104,6 +104,10 @@ This is much faster than the default method.
**Birthday**<br \>
- Fix stray `+` sign in output.
**Public IP**<br \>
- Each source now has a timeout to avoid a hang.
- If the IP detection fails we try another method.
### Image

12
neofetch
View File

@ -1629,13 +1629,15 @@ getlocalip () {
getpublicip () {
if type -p dig >/dev/null 2>&1; then
publicip="$(dig +short myip.opendns.com @resolver1.opendns.com)"
publicip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com 2>/dev/null)"
fi
elif type -p curl >/dev/null 2>&1; then
publicip="$(curl -w '\n' "$public_ip_host")"
if [ -z "$publicip" ] && type -p curl >/dev/null 2>&1; then
publicip="$(curl --max-time 10 -w '\n' "$public_ip_host" 2>/dev/null)"
fi
elif type -p wget >/dev/null 2>&1; then
publicip="$(wget -qO- "$public_ip_host"; printf "%s")"
if [ -z "$publicip" ] && type -p wget >/dev/null 2>&1; then
publicip="$(wget -T 10 -qO- "$public_ip_host" 2>/dev/null; printf "%s")"
fi
}