From 4679935a860f8d720a03ffd388382707b850feda Mon Sep 17 00:00:00 2001
From: MaYuming <mayuming@aliyun.com>
Date: Thu, 6 Jul 2017 10:01:00 +0800
Subject: [PATCH] fix ips issue and improve it.

---
 plugins/available/base.plugin.bash | 4 ++--
 test/plugins/base.plugin.bats      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash
index 4ddfa5ca..7e836e1e 100755
--- a/plugins/available/base.plugin.bash
+++ b/plugins/available/base.plugin.bash
@@ -7,10 +7,10 @@ function ips ()
     group 'base'
     if command -v ifconfig &>/dev/null
     then
-        ifconfig | awk '/inet /{ print $2 }'
+        ifconfig | grep -B 1 -E "inet "|sed 's/addr://g' | sed 's/://g'|awk '{if (NR%3==1) printf $1 " : "; else if (NR%3==2) {print $2}}'
     elif command -v ip &>/dev/null
     then
-        ip addr | grep -oP 'inet \K[\d.]+'
+        ip addr | grep -B 2 'inet ' | sed 's/://g'|sed 's/\/[0-9]\+//g' | awk '{if(NR%4==1) printf $2 " : "; if(NR%4==3) print $2}'
     else
         echo "You don't have ifconfig or ip command installed!"
     fi
diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index a27a4ae7..9fbcda54 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -9,10 +9,10 @@ load ../../plugins/available/base.plugin
     skip 'ifconfig probably requires sudo on TravisCI'
   fi
 
-  declare -r localhost='127.0.0.1'
+  declare -r localhost="lo : 127.0.0.1"
   run ips
   assert_success
-  assert_line $localhost
+  assert_line "$localhost"
 }
 
 @test 'plugins base: myip()' {