build: gen-version-i.sh: use errexit option

[babeltrace.git] / src / common / gen-version-i.sh

diff --git a/src/common/gen-version-i.sh b/src/common/gen-version-i.sh
index 860ac18aa69e922975d65c953f217839a5b3aa2d..bbdee5e6104d57d2eacdeb911a67825c9b852fa8 100755 (executable)
--- a/src/common/gen-version-i.sh
+++ b/src/common/gen-version-i.sh
@@ -12,6 +12,7 @@
 # release version and set an empty git version.
 
 set -o nounset
+set -o errexit
 
 if test "${TOP_SRCDIR:-}" = ""; then
        echo "$0: TOP_SRCDIR is not set" >&2
@@ -38,7 +39,7 @@ fi
 # overwrite the git version with an empty string in "version.i.tmp".
 if test -r "$TOP_SRCDIR/bootstrap" && test -r "$TOP_SRCDIR/.git" &&
                (command -v git > /dev/null 2>&1); then
-       GIT_VERSION_STR="$(cd "$TOP_SRCDIR" && git describe --tags --dirty)"
+       GIT_VERSION_STR="$(cd "$TOP_SRCDIR" && (git describe --tags --dirty || true))"
        GIT_CURRENT_TAG="$(cd "$TOP_SRCDIR" && (git describe --tags --exact-match --match="v[0-9]*" HEAD || true) 2> /dev/null)"
        echo "#define BT_VERSION_GIT \"$GIT_VERSION_STR\"" > version.i.tmp