From 10415df93e9edd7ae32bcb62a6fb18371bfb10c7 Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Thu, 16 Jan 2014 01:29:33 +0100 Subject: [PATCH] runastyle: Ignore user's default options file If we pass --options=none to astyle, it ignores the user's default options file, and only uses the command line parameters. This way, if the user has a default options file, it won't conflict with the style set by the script. --- runastyle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runastyle b/runastyle index 384a599d9..f3c059d25 100755 --- a/runastyle +++ b/runastyle @@ -14,7 +14,7 @@ if [[ "`astyle --version 2>&1`" != ${ASTYLE_VERSION}* ]]; then fi style="--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0" -options="--pad-header --unpad-paren --suffix=none --convert-tabs" +options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs" astyle $style $options cli/*.cpp astyle $style $options cli/*.h