fixed bug in makefile version

luids-io · Jan 7, 2021 · 6a4ab82 · 6a4ab82
1 parent ef0b6fc
commit 6a4ab82
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ COMMANDS=ludns resolvcache resolvcheck resolvcollect
 BINARIES=$(addprefix bin/,$(COMMANDS))
 
 # Used to populate version in binaries
-VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
+VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always | sed 's/^v//')
 REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
 DATEBUILD=$(shell date +%FT%T%z)
 

diff --git a/Makefile.release b/Makefile.release
@@ -11,7 +11,7 @@ endif
 
 NAME:=dns
 COMMANDS=ludns resolvcache resolvcheck resolvcollect
-VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
+VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always | sed 's/^v//')
 LINUX_ARCH:=amd64 arm arm64 ppc64le s390x mips mips64le
 FREEBSD_ARCH:=amd64
 OPENBSD_ARCH:=amd64

diff --git a/deployments/installer/installer_linux.sh b/deployments/installer/installer_linux.sh
@@ -395,6 +395,9 @@ file  = "${VAR_DIR}/${NAME}/cache-trace.log"
 file  = "${CACHE_DIR}/${NAME}/cache-dump.log"
 secs  = 60
 
+[log]
+format = "log"
+
 EOF
 		} &>>$LOG_FILE
 		[ $? -ne 0 ] && step_err && return 1