Browse Source

'ip' command compatibility and much quicker external IP detection

Niccolò Maggioni 8 years ago
parent
commit
a127c4f88e
1 changed files with 6 additions and 2 deletions
  1. 6 2
      plugins/systemadmin/systemadmin.plugin.zsh

+ 6 - 2
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