stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix #1596 - some version of git don't like describe in subdir

Browse source
This commit is contained in:
Adam Sutton 2013-02-04 14:11:07 +00:00
parent 5c1359b663
commit ac36914b98
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
support/version
View file

@ -8,11 +8,11 @@ FILE=$1
# Calculate version
if [ -d ".git" ]; then
VER=$(cd $(dirname $0); git describe --dirty --match "v*" 2> /dev/null)
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
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