Skip to content

Commit

Permalink
Merge pull request #386 from oliv3r/dev/fix_version_tag
Browse files Browse the repository at this point in the history
version: Do not put a slash in the version tag
  • Loading branch information
yrutschle authored Jul 30, 2023
2 parents 29c949e + 6672cc0 commit 4cbff96
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions genver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ fi
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.
# zip file.

# If downloaded from the release page, the directory
# has the version number.
release=`pwd | sed s/.*sslh-// | grep "[[:digit:]]"`

if [ "x$release" = "x" ]; then
# If downloaded from the head, GitHub creates the
# zip file with all files dated from the last
Expand All @@ -28,7 +28,7 @@ fi
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'`
2>/dev/null | tr -s '/' '-' | tr -d '\n'`

# Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null
Expand Down

0 comments on commit 4cbff96

Please sign in to comment.