update toolchecker.mk

diff --git a/make/toolchecker.mk b/make/toolchecker.mk
index 3675ddf29b871a79c73c3573d1366258662269a9..f518cb943ac86c331f4a8e277a284cb738eaa786 100755 (executable)
--- a/make/toolchecker.mk
+++ b/make/toolchecker.mk
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 ############################################################################################
 ### toolchecker
 ############################################################################################
@@ -16,12 +15,14 @@ echo ""
 echo ""
 echo "- check installed hostapps..."
 echo ""
-       CUT=`which cut`
-       GREP=`which grep`
+    AWK="$(which awk)" || { echo '- Please install awk first!'; exit; }
+       CUT=$(which cut)
+       GREP=$(which grep)
        # build-essentials
-    version=$(dpkg-query -W -f='${Version}' build-essential 2>/dev/null)
-    if [ -n "$version" ]; then
-        echo "build-essential:          $version"
+       package_info=$(dpkg -s build-essential 2>/dev/null)
+       if echo "$package_info" | grep -q "install ok"; then
+        VERSION=$(echo "$package_info" | grep "^Version:" | cut -d' ' -f2 | cut -d'-' -f1 | cut -d'u' -f1)
+        echo "build-essential:          "$VERSION
     else
         echo -e "build-essential:          \033[31mnot installed\033[0m"
     fi
@@ -32,7 +33,7 @@ echo ""
                echo "cvs:                      "`$CVS --version | $GREP Concurrent | $CUT -f5 -d " "| $CUT -f1 -d "-"`
        else
                echo -e "cvs:                      \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # svn
        SVN=`which svn`
@@ -40,7 +41,7 @@ echo ""
                echo "svn(subversion):          "`$SVN --version | $GREP "svn, " | $CUT -f3 -d " "`
        else
                echo -e "svn(subversion):          \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # automake
        AUTOMAKE=`which automake`
@@ -48,7 +49,7 @@ echo ""
                echo "automake:                 "`$AUTOMAKE --version | $GREP automake | $CUT -f4 -d " "`
        else
                echo -e "automake:                 \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # autoconf
        AUTOCONF=`which autoconf`
@@ -56,7 +57,7 @@ echo ""
                echo "autoconf:                 "`$AUTOCONF --version | $GREP autoconf | $CUT -f4 -d " "`
        else
                echo -e "autoconf:                 \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # libtool
        LIBTOOL=`which libtool`
@@ -64,7 +65,7 @@ echo ""
                echo "libtool:                 " `$LIBTOOL --version | $GREP libtool | $CUT -f4 -d " "`
        else
                echo -e "libtool:                  \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # make
        MAKE=`which make`
@@ -72,7 +73,7 @@ echo ""
                echo "make:                     "`$MAKE --version | $GREP Make | $CUT -f3 -d " "`
        else
                echo -e "make:                     \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # makeinfo
        MAKEINFO=`which makeinfo`
@@ -80,7 +81,7 @@ echo ""
                echo "makeinfo(texinfo):        "`$MAKEINFO --version | grep 'texinfo' | awk '{print $4}'`
        else
                echo -e "makeinfo(texinfo):        \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
     version=$(meson --version 2>/dev/null)
     if [ -n "$version" ]; then
@@ -95,7 +96,7 @@ echo ""
                echo "gettext:                  "`$GETTEXT --version | $GREP gettext | $CUT -f4 -d " "`
        else
                echo -e "gettext:                  \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # tar
        TAR=`which tar`
@@ -103,7 +104,7 @@ echo ""
                echo "tar:                      "`$TAR --version | $GREP tar | $CUT -f4 -d " "`
        else
                echo -e "tar:                      \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # gunzip
        GUNZIP=`which gunzip`
@@ -111,7 +112,7 @@ echo ""
                echo "gunzip:                   "`$GUNZIP --version | $GREP gzip | $CUT -f3 -d " "`
        else
                echo -e "gunzip:                   \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # bunzip2
        BUNZIP2=`which bunzip2`
@@ -119,7 +120,7 @@ echo ""
                echo "bunzip2:                  "`bunzip2 --help 2> btmp; $GREP Version < btmp | $CUT -c 50-54; rm btmp`
        else
                echo -e "bunzip2:                  \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # patch
        PATCH=`which patch`
@@ -127,7 +128,7 @@ echo ""
                echo "patch:                    "`$PATCH --version | $GREP patch | $CUT -f3 -d " "`
        else
                echo -e "patch:                    \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # infocmp
        INFOCMP=`which infocmp`
@@ -185,21 +186,13 @@ echo ""
                echo -e "bison:                    \033[31mnot installed\033[0m"
        fi
        #---------------------------------------------#
-       # awk
-       AWK=`which awk`
-       if [ $AWK ] && [ $AWK != " " ]; then
-               echo "awk:                      "`$AWK --version | grep -oP '\d+\.\d+\.\d+' | head -n 1`
-       else
-               echo -e "awk:                      \033[31mnot installed\033[0m"
-       fi;
-       #---------------------------------------------#
        # pkg-config
        PKGCONFIG=`which pkg-config`
        if [ $PKGCONFIG ] && [ $PKGCONFIG != " " ]; then
                echo "pkg-config:               "`$PKGCONFIG --version | $GREP .`
        else
                echo -e "pkg-config:               \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # wget
        WGET=`which wget`
@@ -207,7 +200,7 @@ echo ""
                echo "wget:                     "`$WGET --version | $GREP Wget | $CUT -f3 -d " "`
        else
                echo -e "wget:                     \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # git
        GIT=`which git`
@@ -215,7 +208,7 @@ echo ""
                echo "git:                      "`$GIT --version | $GREP git | $CUT -f3 -d " "`
        else
                echo -e "git:                      \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # bash
        BASH=`which bash`
@@ -223,7 +216,7 @@ echo ""
                echo "bash:                     "`$BASH --version | $GREP bash | $CUT -f4 -d " "`
        else
                echo -e "bash:                     \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # unp
        UNP=`which unp`
@@ -231,7 +224,7 @@ echo ""
                echo "unp:                      ok"
        else
                echo -e "unp:                      \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # cmake
        CMAKE=`which cmake`
@@ -239,7 +232,7 @@ echo ""
                echo "cmake:                    "`$CMAKE --version | $GREP version | $CUT -f3 -d " "`
        else
                echo -e "cmake:                    \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # gperf
        QPERF=`which gperf`
@@ -247,33 +240,42 @@ echo ""
                echo "gperf:                    "`$QPERF --version | $GREP gperf | $CUT -f3 -d " "`
        else
                echo -e "gperf:                    \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # help2man
        H2MAN=`which help2man`
        if [ $H2MAN ] && [ $H2MAN != " " ]; then
                echo "help2man:                 "`$H2MAN --version | $GREP help2man | $CUT -f3 -d " "`
        else
-               echo -e "help2man:                 \033[31mnot installed\033[0m"
-       fi;
+        echo -e "help2man:                 \033[31mnot installed\033[0m"
+       fi
        #---------------------------------------------#
        # libncurses5-dev
-       NCURSES=`dpkg -s libncurses5-dev 2>/dev/null | $GREP 'Status'`
-       if [ -n "$NCURSES" ]; then
-               VERSION=`echo $NCURSES`
-               echo "libncurses5-dev:         "`echo $VERSION | $CUT -f2 -d ':'`
+       package_info=$(dpkg -s libncurses5-dev 2>/dev/null)
+       if echo "$package_info" | grep -q "install ok"; then
+        VERSION=$(echo "$package_info" | grep "^Version:" | cut -d' ' -f2 | cut -d'-' -f1)
+               echo "libncurses5-dev:          "`echo $VERSION`
        else
                echo -e "libncurses5-dev:          \033[31mnot installed\033[0m"
-       fi;
+       fi
        #---------------------------------------------#
        # glib2-devel
-       GLIB2_DEV=`dpkg -s libglib2.0-dev 2>/dev/null | $GREP 'Status'`
-       if [ -n "$GLIB2_DEV" ]; then
-               VERSION=`echo $GLIB2_DEV`
-               echo "glib2.0-dev:             "`echo $VERSION | $CUT -f2 -d ':'`
+       package_info=$(dpkg -s libglib2.0-dev 2>/dev/null)
+       if echo "$package_info" | grep -q "install ok"; then
+        VERSION=$(echo "$package_info" | grep "^Version:" | cut -d' ' -f2 | cut -d'-' -f1)
+               echo "glib2.0-dev:              "`echo $VERSION`
        else
                echo -e "glib2.0-dev:              \033[31mnot installed\033[0m"
-       fi;
+       fi
+       #---------------------------------------------#
+       # (Ubuntu)libssl-dev / (Red Hat)openssl-devel
+       package_info=$(dpkg -s libssl-dev 2>/dev/null)
+       if echo "$package_info" | grep -q "install ok"; then
+        VERSION=$(echo "$package_info" | grep "^Version:" | cut -d' ' -f2 | cut -d'-' -f1)
+               echo "libssl-dev:               "`echo $VERSION`
+       else
+               echo -e "libssl-dev:              \033[31mnot installed\033[0m"
+       fi
        #---------------------------------------------#
 echo ""
 echo -e "\033[31m* check your installed hostapps in the list above !!!\033[0m"