fixes #1403: fixed extraction of the version number for archives without .git dir

pull/1404/head
philsmd 7 years ago
parent 77f3eb2864
commit 1030f5b44e
No known key found for this signature in database
GPG Key ID: 4F25D016D9D6A8AF

@ -46,6 +46,7 @@
- Fixed the parsing of descrypt hashes if the hashes do have non-standard characters within the salt
- Fixed the use of --veracrypt-pim option. It was completely ignored without showing an error
- Fixed the version number used in the restore file header
- Fixed the version number extraction for github releases which do not including the .git directory
##
## Improvements

@ -122,8 +122,12 @@ WIN_ICONV_64 := /opt/win-iconv-64
COMPTIME := $(shell date +%s)
# the following variable value will be automatically replaced by the "git archive" command
# (which is automatically run for every github release)
# the value will be something like this: "tag: vX.Y.Z, refs/pull/Y/head"
VERSION_EXPORT := $Format:%D$
#VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|$(SED) -r 's|.* (\w+/)?([^ ]+)|\2|')
#VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)" | $(SED) 's/.*: v\([\.0-9]*\),.*/v\1/')
VERSION_TAG := 4.0.0-rc6
##

Loading…
Cancel
Save