diff --git a/runastyle b/runastyle
index 19fb92234..d7fe37143 100755
--- a/runastyle
+++ b/runastyle
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 # The version check in this script is used to avoid commit battles
 # between different developers that use different astyle versions as
@@ -7,37 +6,37 @@
 
 # If project management wishes to take a newer astyle version into use
 # just change this string to match the start of astyle version string.
-ASTYLE_VERSION="Artistic Style Version 3.0.1"
-ASTYLE="astyle"
+ASTYLE_VERSION="3.0.1"
+ASTYLE="${ASTYLE-astyle}"
 
-DETECTED_VERSION=`$ASTYLE --version 2>&1`
-if [[ "$DETECTED_VERSION" != ${ASTYLE_VERSION}* ]]; then
-    echo "You should use: ${ASTYLE_VERSION}";
-    echo "Detected: ${DETECTED_VERSION}"
-    exit 1;
+DETECTED_VERSION=$("$ASTYLE" --version 2>&1 | awk '{ print $NF; }')
+if [ "$DETECTED_VERSION" != "${ASTYLE_VERSION}" ]; then
+    echo "You should use version: ${ASTYLE_VERSION}"
+    echo "Detected version: ${DETECTED_VERSION}"
+    exit 1
 fi
 
 RCFILE=.astylerc
 
-$ASTYLE --options=$RCFILE cli/*.cpp
-$ASTYLE --options=$RCFILE cli/*.h
-$ASTYLE --options=$RCFILE democlient/*.cpp
-$ASTYLE --options=$RCFILE gui/*.cpp
-$ASTYLE --options=$RCFILE gui/*.h
-$ASTYLE --options=$RCFILE -r gui/test/*.cpp
-$ASTYLE --options=$RCFILE -r gui/test/*.h
-$ASTYLE --options=$RCFILE lib/*.cpp
-$ASTYLE --options=$RCFILE lib/*.h
-$ASTYLE --options=$RCFILE test/*.cpp
-$ASTYLE --options=$RCFILE test/cfg/*.c
-$ASTYLE --options=$RCFILE test/cfg/*.cpp
-$ASTYLE --options=$RCFILE test/*.h
+"$ASTYLE" --options=$RCFILE cli/*.cpp
+"$ASTYLE" --options=$RCFILE cli/*.h
+"$ASTYLE" --options=$RCFILE democlient/*.cpp
+"$ASTYLE" --options=$RCFILE gui/*.cpp
+"$ASTYLE" --options=$RCFILE gui/*.h
+"$ASTYLE" --options=$RCFILE --recursive "gui/test/*.cpp"
+"$ASTYLE" --options=$RCFILE --recursive "gui/test/*.h"
+"$ASTYLE" --options=$RCFILE lib/*.cpp
+"$ASTYLE" --options=$RCFILE lib/*.h
+"$ASTYLE" --options=$RCFILE test/*.cpp
+"$ASTYLE" --options=$RCFILE test/cfg/*.c
+"$ASTYLE" --options=$RCFILE test/cfg/*.cpp
+"$ASTYLE" --options=$RCFILE test/*.h
 
-$ASTYLE --options=$RCFILE --recursive "tools/*.cpp"
-$ASTYLE --options=$RCFILE --recursive "tools/*.h"
+"$ASTYLE" --options=$RCFILE --recursive "tools/*.cpp"
+"$ASTYLE" --options=$RCFILE --recursive "tools/*.h"
 
-$ASTYLE --options=$RCFILE --recursive "samples/*.c"
-$ASTYLE --options=$RCFILE --recursive "samples/*.cpp"
+"$ASTYLE" --options=$RCFILE --recursive "samples/*.c"
+"$ASTYLE" --options=$RCFILE --recursive "samples/*.cpp"
 
 # Convert tabs to spaces.. even in strings
 # sed -i "s/\t/ /g" test/test*.cpp
@@ -46,13 +45,13 @@ $ASTYLE --options=$RCFILE --recursive "samples/*.cpp"
 # TODO: use other tool than xmllint? use tabs instead of spaces?
 for CFGFILE in cfg/*.cfg
 do
-   xmllint --format -o ${CFGFILE}_ ${CFGFILE}
-   mv -f ${CFGFILE}_ ${CFGFILE}
+   xmllint --format -o "${CFGFILE}_" "$CFGFILE"
+   mv -f "${CFGFILE}_" "$CFGFILE"
 done
 for PLATFORMFILE in platforms/*.xml
 do
-   xmllint --format -o ${PLATFORMFILE}_ ${PLATFORMFILE}
-   mv -f ${PLATFORMFILE}_ ${PLATFORMFILE}
+   xmllint --format -o "${PLATFORMFILE}_" "$PLATFORMFILE"
+   mv -f "${PLATFORMFILE}_" "$PLATFORMFILE"
 done
 
 xmllint --format -o man/cppcheck.1.xml_ man/cppcheck.1.xml