From: Denis Pellizzon Date: Thu, 6 Dec 2012 20:48:58 +0000 (+0100) Subject: Fix #1497 - Added error checking if 'git describe --dirty' is not supported by the... X-Git-Tag: v3.5~191 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196780df42317682ea3fe3ff172e6039157a643d;p=thirdparty%2Ftvheadend.git Fix #1497 - Added error checking if 'git describe --dirty' is not supported by the host. --- diff --git a/support/version b/support/version index 8f74a65bf..e767cb620 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