diff options
author | Niccolò Maggioni <nicco.maggioni@gmail.com> | 2015-08-26 10:48:01 +0200 |
---|---|---|
committer | Niccolò Maggioni <nicco.maggioni@gmail.com> | 2015-08-26 10:48:01 +0200 |
commit | a127c4f88e9807c9d5ac58f5424dfc479370c227 (patch) | |
tree | 8e2104d2462c747f40b3731944a26bbb43a08d8d /plugins/systemadmin | |
parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
download | zsh-a127c4f88e9807c9d5ac58f5424dfc479370c227.tar.gz zsh-a127c4f88e9807c9d5ac58f5424dfc479370c227.tar.bz2 zsh-a127c4f88e9807c9d5ac58f5424dfc479370c227.zip |
'ip' command compatibility and much quicker external IP detection
Diffstat (limited to 'plugins/systemadmin')
-rw-r--r-- | plugins/systemadmin/systemadmin.plugin.zsh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh index 4ae70dfa7..f6641b273 100644 --- a/plugins/systemadmin/systemadmin.plugin.zsh +++ b/plugins/systemadmin/systemadmin.plugin.zsh @@ -140,12 +140,16 @@ d0() { # gather external ip address geteip() { - curl http://ifconfig.me + echo "$(curl -s -S http://ipecho.net/plain)" } # determine local IP address getip() { - ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' + if [ "$(which 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 |