third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-12 15:17:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from oliv3r/dev/fix_version_tag

Browse Source 
version: Do not put a slash in the version tag
This commit is contained in:
Yves Rutschle 2023-07-30 23:12:32 +02:00 committed by GitHub
commit 4cbff962db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
genver.sh
View File

@ -10,12 +10,12 @@ fi
if [ ! -d .git ] || ! `(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 # If we don't have git, we can't work out what
# version this is. It must have been downloaded as a # version this is. It must have been downloaded as a
# zip file. # zip file.
# If downloaded from the release page, the directory # If downloaded from the release page, the directory
# has the version number. # has the version number.
release=`pwd | sed s/.*sslh-// | grep "[[:digit:]]"` release=`pwd | sed s/.*sslh-// | grep "[[:digit:]]"`
if [ "x$release" = "x" ]; then if [ "x$release" = "x" ]; then
# If downloaded from the head, GitHub creates the # If downloaded from the head, GitHub creates the
# zip file with all files dated from the last # zip file with all files dated from the last
@ -28,7 +28,7 @@ fi
if [ -d .git ] && 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 # generate the version info based on the tag
release=`(git describe --tags || git --describe || git describe --all --long) \ release=`(git describe --tags || git --describe || git describe --all --long) \
2>/dev/null | tr -d '\n'` 2>/dev/null | tr -s '/' '-' | tr -d '\n'`
# Are there uncommitted changes? # Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null git update-index --refresh --unmerged > /dev/null