Merge pull request #4285 from nmaggioni/master

'ip' command compatibility and much quicker external IP detection
This commit is contained in:
Robby Russell 2015-08-31 22:21:25 -07:00
commit 0532860c61

View File

@ -140,12 +140,16 @@ d0() {
# gather external ip address
geteip() {
curl http://ifconfig.me
curl -s -S https://icanhazip.com
}
# determine local IP address
getip() {
if (( ${+commands[ip]} )); then
ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}'
else
ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
fi
}
# Clear zombie processes