From: Flole Date: Mon, 8 Apr 2024 19:17:31 +0000 (+0200) Subject: Fix detection of unknown version numbers in support/version X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4874aaa3161fbdd8b9d3abe50fd3fa20b18f8b0b;p=thirdparty%2Ftvheadend.git Fix detection of unknown version numbers in support/version Fixes: #1683 --- diff --git a/support/version b/support/version index f1e5a7122..5d99544ec 100755 --- a/support/version +++ b/support/version @@ -10,7 +10,7 @@ FILE=$1 if [ -d ".git" ]; then DIRTYHASH=$(echo -n "$NODIRTY" | sha512sum - | awk '{print $1}') VER=$(cd "$(dirname "$0")"/..; git describe --dirty --match "v*" 2> /dev/null) - if [ $? -ne 0 ] | [ "$DIRTYHASH" = "a70f88117be8b5c1ade69df0096182da65d877c37e375ed1f22c7225c321405eb89e40f36cf696906d48c73545f771f8eb5d4bbb7507200608f66990d8d96430" ]; then + if [ $? -ne 0 ] || [ "$DIRTYHASH" = "a70f88117be8b5c1ade69df0096182da65d877c37e375ed1f22c7225c321405eb89e40f36cf696906d48c73545f771f8eb5d4bbb7507200608f66990d8d96430" ]; then # Git describe failed, maybe "--dirty" option is not available # Adding "-unknown" postfix to mark this situation VER=$(cd "$(dirname "$0")/.."; git describe --match "v*" 2> /dev/null)