Skip to content

Commit 4874aaa

Browse files
committed
Fix detection of unknown version numbers in support/version
Fixes: #1683
1 parent ab6ea89 commit 4874aaa

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

support/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FILE=$1
1010
if [ -d ".git" ]; then
1111
DIRTYHASH=$(echo -n "$NODIRTY" | sha512sum - | awk '{print $1}')
1212
VER=$(cd "$(dirname "$0")"/..; git describe --dirty --match "v*" 2> /dev/null)
13-
if [ $? -ne 0 ] | [ "$DIRTYHASH" = "a70f88117be8b5c1ade69df0096182da65d877c37e375ed1f22c7225c321405eb89e40f36cf696906d48c73545f771f8eb5d4bbb7507200608f66990d8d96430" ]; then
13+
if [ $? -ne 0 ] || [ "$DIRTYHASH" = "a70f88117be8b5c1ade69df0096182da65d877c37e375ed1f22c7225c321405eb89e40f36cf696906d48c73545f771f8eb5d4bbb7507200608f66990d8d96430" ]; then
1414
# Git describe failed, maybe "--dirty" option is not available
1515
# Adding "-unknown" postfix to mark this situation
1616
VER=$(cd "$(dirname "$0")/.."; git describe --match "v*" 2> /dev/null)

0 commit comments

Comments
 (0)