From f52eb9bd344bb3345aeff74c284027c2e4071fd1 Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 8 Jan 2020 21:09:57 +0100 Subject: [PATCH] toolcheck.mk: fix and add libglib2 check --- make/toolchecker.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/make/toolchecker.mk b/make/toolchecker.mk index 4ac4047..f4bd5b6 100755 --- a/make/toolchecker.mk +++ b/make/toolchecker.mk @@ -29,7 +29,7 @@ echo "" # svn SVN=`which svn` if [ $SVN ] && [ $SVN != " " ]; then - echo "svn(subversion): "`$SVN --version | $GREP "svn, " | $CUT -f3 -d " "` + echo "svn(subversion): "`$SVN --version | $GREP "svn, " | $CUT -f3 -d " "` else echo -e "svn(subversion): \033[31mnot installed\033[0m" fi; @@ -245,12 +245,21 @@ echo "" # libncurses NCURSES=`dpkg -l '*ncurses*' | $GREP 'ncurses-bin'` if [ -n "$NCURSES" ]; then - VERSION=`echo $NCURSES | awk '{print $3}' | $CUT -f1 -d " "` + VERSION=`echo $NCURSES | awk '{print $3}' | $CUT -f1 -d "-"` echo "libncurses: "$VERSION else echo -e "libncurses: \033[31mnot installed\033[0m" fi; #---------------------------------------------# + # libglib2.0 dpkg -l '*libglib2*' | grep "libglib2.0-bin" | awk '{print $3}' | cut -d'-' -f1 + GLIB2=`dpkg -l '*libglib2*' | $GREP 'libglib2.0-bin'` + if [ -n "$GLIB2" ]; then + VERSION=`echo $GLIB2 | awk '{print $3}' | $CUT -f1 -d "-"` + echo "libglib2-dev: "$VERSION + else + echo -e "libglib2-dev: \033[31mnot installed\033[0m" + fi; + #---------------------------------------------# echo "" echo -e "\033[31m* check your installed hostapps in the list above !!!\033[0m" echo "" -- 2.39.5