From ddbcb1591e17e66efe21689bfde524971a091da9 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Dec 2012 21:48:58 +0100 Subject: [PATCH] Added error checking if 'git describe --dirty' is not supported by the host. --- support/version | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/support/version b/support/version index 8f74a65..e767cb6 100755 --- a/support/version +++ b/support/version @@ -8,7 +8,13 @@ FILE=$1 # Calculate version if [ -d ".git" ]; then - VER=$(cd $(dirname $0); git describe --dirty --match "v*" 2> /dev/null | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/") + VER=$(cd $(dirname $0); git describe --dirty --match "v*" 2> /dev/null) + if [ $? -ne 0 ]; 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)--UNKNOWN + fi + VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/") else VER=$(head -1 $(dirname $0)/../debian/changelog | awk '{ print $2 }' | tr -d '()' | cut -d '-' -f 1) fi -- 1.5.6.5