mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-26 00:09:10 +01:00
Merge pull request #4285 from nmaggioni/master
'ip' command compatibility and much quicker external IP detection
This commit is contained in:
commit
0532860c61
@ -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() {
|
||||
ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user