Minimalne izmjene u paketu za Debian stretch

[carnet-tools-cn.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index dc3450d..37bd113 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -27,7 +27,8 @@ cp_get_ifaddr() {
     return 2
   fi
 
-  ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  #ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf($2) }'`"
 
   if [ -z $ifaddr ]; then
     echo "cp_get_ifaddr: $interface: No ip address found" 1>&2
@@ -63,7 +64,8 @@ cp_get_ifmask() {
     return 1
   fi
 
-  ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  #ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  ifmask="`/sbin/ifconfig $interface | awk '/netmask /{ printf($4) }'`"
 
   if [ -z "$ifmask" ]; then
     echo "cp_get_ifmask: $interface: No netmask found" 1>&2