From 0a277f1455e1e04e501d309cf2aa25e52e809b90 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sat, 28 Oct 2017 18:47:54 +0200 Subject: [PATCH] Allow using system astyle --- scripts/astyle.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/astyle.sh b/scripts/astyle.sh index 326bb782982d..6962d7aba3a7 100755 --- a/scripts/astyle.sh +++ b/scripts/astyle.sh @@ -14,16 +14,23 @@ # # ########################################################################### -for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle +min_version="3.0.0" +astyle_version_check() { + [ `printf "$($1 --version | cut -d ' ' -f4)\n$min_version" | sort -V | head -n1` = "$min_version" ] +} + +for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle astyle do - if type -p $ASTYLE >/dev/null; then - break + if type -p $ASTYLE >/dev/null ; then + if astyle_version_check $ASTYLE ; then + break + fi fi ASTYLE= done if [ -z "$ASTYLE" ]; then - echo "qgisstyle not found - please enable WITH_ASTYLE in cmake and build it" >&2 + echo "qgisstyle / astyle not found - please install astyle >= $min_version or enable WITH_ASTYLE in cmake and build" >&2 exit 1 fi