diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
| commit | 93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch) | |
| tree | 7cc87fcd416bf71cee77f30bf2e60cf607671f43 /plugins/systemadmin/systemadmin.plugin.zsh | |
| parent | 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff) | |
| parent | 0532860c618aabc02d5dab34391b967e8e4c6272 (diff) | |
| download | zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2 zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip | |
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
plugins/osx/osx.plugin.zsh
Diffstat (limited to 'plugins/systemadmin/systemadmin.plugin.zsh')
| -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 |