瀏覽代碼

ver_linux: pcmciautils, look for numerical input, not field number

Rely on regex to find the version number, rather than rely on numerical input to be found in a particular input field.
Proposed implementation also eliminates the necessity to invoke 'grep' + 'awk'.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alexander Kapshuk 9 年之前
父節點
當前提交
f437d1ed68
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      scripts/ver_linux

+ 6 - 1
scripts/ver_linux

@@ -77,7 +77,12 @@ awk '/version/{
 	substr($0,RSTART,RLENGTH))
 	substr($0,RSTART,RLENGTH))
 }'
 }'
 
 
-pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils           ", $2}'
+pccardctl -V 2>&1 |
+awk '/pcmciautils/{
+	match($0, /[0-9]+([.]?[0-9]+)+/)
+	printf("Pcmciautils\t\t%s\n",
+	substr($0,RSTART,RLENGTH))
+}'
 
 
 cardmgr -V 2>&1| grep version | awk \
 cardmgr -V 2>&1| grep version | awk \
 'NR==1{print "pcmcia-cs             ", $3}'
 'NR==1{print "pcmcia-cs             ", $3}'