Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[firefly-linux-kernel-4.4.55.git] / scripts / ver_linux

diff --git a/scripts/ver_linux b/scripts/ver_linux
index e6b57d57df980e0b2ad930aaa2a0e5e6ba26ffd4..024a11ac8b97a00f3843358a1ebcfa087ac4ec28 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -157,14 +157,37 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
 oprofiled --version 2>&1 | awk \
 '(NR==1 && ($2 == "oprofile")) {print "oprofile              ", $3}'
 
-expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
+expr --v 2>&1 |
+awk '/^expr/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Sh-utils\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
-udevinfo -V 2>&1 | grep version | awk '{print "udev                  ", $3}'
+udevadm --version 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Udev\t\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
-iwconfig --version 2>&1 | awk \
-'(NR==1 && ($3 == "version")) {print "wireless-tools        ",$4}'
+iwconfig --version 2>&1 |
+awk '/version/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Wireless-tools\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
-if [ -e /proc/modules ]; then
-    X=`cat /proc/modules | sed -e "s/ .*$//"`
-    echo "Modules Loaded         "$X
-fi
+test -e /proc/modules &&
+sort /proc/modules |
+sed '
+       s/ .*//
+       H
+${
+       g
+       s/^\n/Modules Loaded\t\t/
+       y/\n/ /
+       q
+}
+       d
+'