diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
| commit | e4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch) | |
| tree | fee07d9adfee79d1c88206ead154a23520ac51cb /plugins/systemadmin | |
| parent | 5c8b0cc0c1782b34790548498018fb9e0300992b (diff) | |
| parent | b05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff) | |
| download | zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2 zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip | |
Merge branch 'master' into copyfile-portability
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..8c2633355 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 + 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 |