fix astyle version check

jef-n · jef-n · commit dee284fe9745 · 2018-04-24T21:55:55.000+02:00
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -22,7 +22,7 @@ fi
 
 min_version="3"
 astyle_version_check() {
-	[ `printf "$($1 --version | cut -d ' ' -f4)\n$min_version" | sort -${SV} | head -n1` = "$min_version" ]
+	[ `printf "$($1 --version 2>&1 | cut -d ' ' -f4)\n$min_version" | sort -${SV} | head -n1` = "$min_version" ]
 }
 
 for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle astyle

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ fi`
`22`	`22`
`23`	`23`	`min_version="3"`
`24`	`24`	`astyle_version_check() {`
`25`		- [ `printf "$($1 --version \| cut -d ' ' -f4)\n$min_version" \| sort -${SV} \| head -n1` = "$min_version" ]
	`25`	+ [ `printf "$($1 --version 2>&1 \| cut -d ' ' -f4)\n$min_version" \| sort -${SV} \| head -n1` = "$min_version" ]
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle astyle`