From da8a44167b7488390cf6dae045c83e0716e11deb Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 9 Oct 2017 12:44:53 -0700 Subject: [PATCH] - update cppcheck script to install cppcheck if missing and check multiple paths for cfg file --- mk/linux/mg_cppcheck.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mk/linux/mg_cppcheck.sh b/mk/linux/mg_cppcheck.sh index 5fbee8ff..7856e4f9 100755 --- a/mk/linux/mg_cppcheck.sh +++ b/mk/linux/mg_cppcheck.sh @@ -4,12 +4,23 @@ # Written by Mark Vejvoda # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ +if ! cppcheck_loc="$(type -p "cppcheck")" || [ -z "$cppcheck_loc" ]; then + # install foobar here + echo "CPPCHECK is not installed, installing now..." + sudo apt install cppcheck +fi + # (Actual) Location of the cppcheck binary CPPCHECK=$(readlink -f $(which cppcheck)) # cppcheck now depends on this library (see 'cppcheck --help' for the '--library' option) # If you use the Debian / Ubuntu package set this to: /usr/share/cppcheck/cfg/std.cfg -CPPCHECKLIB=$(dirname $CPPCHECK)/cfg/std.cfg +if [ -e "$(dirname $CPPCHECK)/cfg/std.cfg" ]; then + CPPCHECKLIB=$(dirname $CPPCHECK)/cfg/std.cfg +elif [ -e "/usr/share/cppcheck/cfg/std.cfg" ]; then + CPPCHECKLIB=/usr/share/cppcheck/cfg/std.cfg +fi + # File to write results to LOGFILE=/tmp/cppcheck.log