Astyle: allow version 3.1

This commit is contained in:
Julien Lecoeur
2018-05-15 16:10:20 +02:00
committed by Daniel Agar
parent 873e036e85
commit b299d6222a
+4 -2
View File
@@ -5,6 +5,7 @@ set -eu
ASTYLE_VER_REQUIRED_1="Artistic Style Version 2.06"
ASTYLE_VER_REQUIRED_2="Artistic Style Version 3.0"
ASTYLE_VER_REQUIRED_3="Artistic Style Version 3.0.1"
ASTYLE_VER_REQUIRED_4="Artistic Style Version 3.1"
astyle_ver() {
echo "PX4 requires at least ${ASTYLE_VER_REQUIRED_1}"
@@ -23,10 +24,11 @@ else
if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_1" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_2" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" ];
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_4" ];
then
echo "Error: you're using ${ASTYLE_VER}"
echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, or ${ASTYLE_VER_REQUIRED_3} instead"
echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, ${ASTYLE_VER_REQUIRED_3}, or ${ASTYLE_VER_REQUIRED_4} instead"
exit 1
fi
fi