third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-05-30 23:29:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225 from ffontaine/master

Browse Source 
fix version extraction when building in a larger git tree
This commit is contained in:
yrutschle 2019-04-06 22:12:30 +02:00 committed by GitHub
commit 5684959dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
genver.sh
View File

@ -7,7 +7,7 @@ else
QUIET=0
fi
if ! `(git status | grep -q "On branch") 2> /dev/null`; then
if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then
# If we don't have git, we can't work out what
# version this is. It must have been downloaded as a
# zip file.
@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then
fi
fi
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
# generate the version info based on the tag
release=`(git describe --tags || git --describe || git describe --all --long) \
2>/dev/null | tr -d '\n'`