diff --git a/scripts/auto-formatter.sh b/scripts/auto-formatter.sh
index 9bb1b527..2408d9f4 100755
--- a/scripts/auto-formatter.sh
+++ b/scripts/auto-formatter.sh
@@ -31,14 +31,14 @@ fi
 
 cpp_format="clang-format"
 file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
-file_excludes="-not -path '**/translateObjects.cpp' -not -path '**/translateEvents.cpp'"
+file_excludes="-not -path */translateObjects.cpp -not -path */translateEvents.cpp"
 if command -v ${cpp_format} &> /dev/null; then
   for dir in ${folder_list[@]}; do
     echo "Auto-formatting C/C++ files in ${dir} recursively"
     find ${dir} ${file_excludes} ${file_selectors} | xargs ${cpp_format} --style=file -i
   done
   find ./unittest ${file_selectors} -o -type d -name build -prune | \
-	xargs clang-format --style=file -i
+	xargs ${cpp_format} --style=file -i
 else
   echo "No ${cpp_format} tool found, not formatting C++/C files"
 fi