Skip to content

Commit

Permalink
fix bug in makefile version
Browse files Browse the repository at this point in the history
  • Loading branch information
luisguillenc committed Jan 7, 2021
1 parent c76a683 commit b62236f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COMMANDS=xlistd xlistc xlget
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)

Expand Down
2 changes: 1 addition & 1 deletion Makefile.release
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif

NAME:=xlist
COMMANDS=xlistd xlistc xlget
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
Expand Down
6 changes: 6 additions & 0 deletions deployments/installer/installer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,9 @@ datadir = "${VAR_DIR}/${NAME}"
[xlistd.service]
files = [ "${ETC_DIR}/${NAME}/services.json" ]
[log]
format = "log"
EOF
} &>>$LOG_FILE
[ $? -ne 0 ] && step_err && return 1
Expand Down Expand Up @@ -523,6 +526,9 @@ statusdir = "${VAR_DIR}/${NAME}/status"
[xlget.source]
files = [ "${ETC_DIR}/${NAME}/sources.json" ]
[log]
format = "log"
EOF
} &>>$LOG_FILE
[ $? -ne 0 ] && step_err && return 1
Expand Down

0 comments on commit b62236f

Please sign in to comment.