clang-format and clang-tidy scripts: More robust algorithm to find correct executable

script/clang-format

@@ -13,11 +13,43 @@ import sys
 import threading
 
 
+
+def get_binary(name, version):
+    clang_binary = f"{name}-{version}"
+    try:
+        result = subprocess.check_output([clang_binary, '-version'])
+        if result.returncode == 0:
+            return clang_binary
+    except Exception:
+        pass
+    clang_binary = name
+    try:
+        result = subprocess.run([clang_binary, '-version'], text=True, capture_output=True)
+        if result.returncode == 0 and (f"version {version}") in result.stdout:
+            return clang_binary
+    except Exception as ex:
+        pass
+
+    print(
+        f"""
+        Oops. It looks like {name} is not installed.
+
+        Please check you can run "{name} -version" or "{name}-{version} -version"
+        in your terminal and install
+        {name} (v{version}) if necessary.
+
+        Note you can also upload your code as a pull request on GitHub and see the CI check
+        output to apply {name}
+        """
+    )
+    sys.exit()
+
+
 def run_format(args, queue, lock, failed_files):
     """Takes filenames out of queue and runs clang-format on them."""
     while True:
         path = queue.get()
-        invocation = ["clang-format-13"]
+        invocation = [get_binary("clang-format", 13)]
         if args.inplace:
             invocation.append("-i")
         else:
@@ -58,22 +90,6 @@ def main():
     )
     args = parser.parse_args()
 
-    try:
-        get_output("clang-format-13", "-version")
-    except:
-        print(
-            """
-        Oops. It looks like clang-format is not installed. 
-
-        Please check you can run "clang-format-13 -version" in your terminal and install
-        clang-format (v13) if necessary.
-
-        Note you can also upload your code as a pull request on GitHub and see the CI check
-        output to apply clang-format.
-        """
-        )
-        return 1
-
     files = []
     for path in git_ls_files(["*.cpp", "*.h", "*.tcc"]):
         files.append(os.path.relpath(path, os.getcwd()))

script/clang-tidy

@@ -25,6 +25,39 @@ import sys
 import tempfile
 import threading
 
+def get_binary(name, version):
+    clang_binary = f"{name}-{version}"
+    try:
+        result = subprocess.check_output([clang_binary, '-version'])
+        if result.returncode == 0:
+            return clang_binary
+    except Exception:
+        pass
+    clang_binary = name
+    try:
+        result = subprocess.run([clang_binary, '-version'], text=True, capture_output=True)
+        if result.returncode == 0 and (f"version {version}") in result.stdout:
+            return clang_binary
+        print(f"did not find version {version} in output: {result.stdout}")
+    except Exception as ex:
+        print(ex)
+        pass
+
+    print(
+        f"""
+        Oops. It looks like {name} is not installed.
+
+        Please check you can run "{name} -version" or "{name}-{version} -version"
+        in your terminal and install
+        {name} (v{version}) if necessary.
+
+        Note you can also upload your code as a pull request on GitHub and see the CI check
+        output to apply {name}
+        """
+    )
+    sys.exit()
+
+
 
 def clang_options(idedata):
     cmd = []
@@ -113,7 +146,7 @@ def clang_options(idedata):
 def run_tidy(args, options, tmpdir, queue, lock, failed_files):
     while True:
         path = queue.get()
-        invocation = ["clang-tidy-14"]
+        invocation = [get_binary("clang-tidy", 14)]
 
         if tmpdir is not None:
             invocation.append("--export-fixes")
@@ -193,22 +226,6 @@ def main():
     )
     args = parser.parse_args()
 
-    try:
-        get_output("clang-tidy-14", "-version")
-    except:
-        print(
-            """
-        Oops. It looks like clang-tidy-14 is not installed.
-
-        Please check you can run "clang-tidy-14 -version" in your terminal and install
-        clang-tidy (v14) if necessary.
-
-        Note you can also upload your code as a pull request on GitHub and see the CI check
-        output to apply clang-tidy.
-        """
-        )
-        return 1
-
     idedata = load_idedata(args.environment)
     options = clang_options(idedata)