From fd9f75b3164cd4eb52783eed3be9898dd7fba800 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 13 Dec 2017 15:21:40 +0100 Subject: use the newest available git-clang-format in PATH Hardcoding a specific version is sad as default versions change over time, so instead of tying us to a specific clang version we let the script figure out a good version by looking at what is available in PATH. Gbp-Dch: Ignore --- git-clang-format.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'git-clang-format.sh') diff --git a/git-clang-format.sh b/git-clang-format.sh index d374b66bd..6348652c1 100755 --- a/git-clang-format.sh +++ b/git-clang-format.sh @@ -1,3 +1,10 @@ #!/bin/sh cd "$(dirname "$0")" -git clang-format-3.8 --diff "$@" | sed "s#+/\*\}\}\}\*/#+ /*}}}*/#" | patch -p1 +CLANG_FORMAT="$(find $(echo "$PATH" | tr ':' ' ') -name 'git-clang-format-*' | sort | tail -n1 )" +if [ -z "$CLANG_FORMAT" ]; then + echo >&2 'Could not find a clang-format to use. Is the package clang-format installed?' + exit 1 +fi +git "$(basename "$CLANG_FORMAT" | cut -d'-' -f 2-)" --diff "$@" | \ + sed "s#+/\*\}\}\}\*/#+ /*}}}*/#" | \ + patch -p1 -- cgit v1.2.3