[#2470] fix formatting tools on premium or other repos

diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index 820e60f0ad0ecc36ea0fb156e07fbef0b0a0ac0d..ee1c08fd5fa576e18e8104aa5af62addb8f6096e 100755 (executable)
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -27,6 +27,9 @@ print_usage() {
 Options:
   [-d|--debug]                 enable debug mode, showing every executed command
   [-h|--help]                  print usage (this text)
+  [$directory|$file ...]       one or multiple files to format; if directories
+                               are passed instead, they are searched for all C++
+                               files under it which are then formatted
 ' \
     "$(basename "${0}")"
 }
@@ -38,7 +41,7 @@ while test ${#} -gt 0; do
     '-d'|'--debug') set -vx ;;
 
     # [-h|--help]              print usage (this text).
-    '-h'|'--help') print_usage ;;
+    '-h'|'--help') print_usage; exit 0 ;;
 
     # Allow extra arguments, they should be directories or files to be formatted.
     *) break ;;
@@ -85,6 +88,13 @@ while test ${#} -gt 0; do
     # We specifically want word splitting for the parameters.
     clang-format --style=file -i $(printf '%s' "${parameters}") "${file}"
   elif test -d "${file}"; then
+    # Keep CWD for later use.
+    pwd="${PWD}"
+
+    # First checkout target directory so that the following "git ls-files" call
+    # acts on the proper git repository.
+    cd "${file}"
+
     # Get list of files to format.
     cd "$(git rev-parse --show-toplevel)"
     files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" \
@@ -95,8 +105,13 @@ while test ${#} -gt 0; do
       files=$(printf '%s\n' "${files}" | grep -Fv "${file}" | sed '/^$/d')
     done
 
+    # Restore directory to what it initially was because ${files} contains
+    # relative paths.
+    cd "${pwd}"
+
     # For all files...
     for i in ${files}; do
+      # Run recursively to format file or iterate further through directories.
       "${0}" "${i}"
     done
   fi

diff --git a/tools/uncrustify.sh b/tools/uncrustify.sh
index 6495133d50112be70ccb3bee0aefbe758f7a7378..fd200c5b7d1f35282ac3dcb36c6e3fa0f12f58f2 100755 (executable)
--- a/tools/uncrustify.sh
+++ b/tools/uncrustify.sh
@@ -27,6 +27,9 @@ print_usage() {
 Options:
   [-d|--debug]                 enable debug mode, showing every executed command
   [-h|--help]                  print usage (this text)
+  [$directory|$file ...]       one or multiple files to format; if directories
+                               are passed instead, they are searched for all C++
+                               files under it which are then formatted
 ' \
     "$(basename "${0}")"
 }
@@ -38,7 +41,7 @@ while test ${#} -gt 0; do
     '-d'|'--debug') set -vx ;;
 
     # [-h|--help]              print usage (this text).
-    '-h'|'--help') print_usage ;;
+    '-h'|'--help') print_usage; exit 0 ;;
 
     # Allow extra arguments, they should be directories or files to be formatted.
     *) break ;;
@@ -85,6 +88,13 @@ while test ${#} -gt 0; do
     # We specifically want word splitting for the parameters.
     uncrustify -c "${script_path}/../.uncrustify.cfg" --replace $(printf '%s' "${parameters}") "${file}"
   elif test -d "${file}"; then
+    # Keep CWD for later use.
+    pwd="${PWD}"
+
+    # First checkout target directory so that the following "git ls-files" call
+    # acts on the proper git repository.
+    cd "${file}"
+
     # Get list of files to format.
     cd "$(git rev-parse --show-toplevel)"
     files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" \
@@ -95,8 +105,13 @@ while test ${#} -gt 0; do
       files=$(printf '%s\n' "${files}" | grep -Fv "${file}" | sed '/^$/d')
     done
 
+    # Restore directory to what it initially was because ${files} contains
+    # relative paths.
+    cd "${pwd}"
+
     # For all files...
     for i in ${files}; do
+      # Run recursively to format file or iterate further through directories.
       "${0}" "${i}"
     done
   fi