Pull request: 3033 verbose version output

Merge in DNS/adguard-home from 3033-version-bug to master

Closes #3033.

Squashed commit of the following:

commit b10bd35c5c2e5a922af730e5c0930e6cd92c7855
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon May 24 21:15:46 2021 +0300

    all: fix & imp scripts, rm main module version
This commit is contained in:
Eugene Burkov
2021-05-24 21:46:33 +03:00
parent 03a828ef51
commit 755a5055c6
5 changed files with 15 additions and 12 deletions

View File

@@ -52,11 +52,10 @@ readonly channel
# Check VERSION against the default value from the Makefile. If it is that, use
# the version calculation script.
if [ "${VERSION:-}" = 'v0.0.0' ] || [ "${VERSION:-}" = '' ]
version="${VERSION:-}"
if [ "$version" = 'v0.0.0' ] || [ "$version" = '' ]
then
version="$( sh ./scripts/make/version.sh )"
else
version="$VERSION"
fi
readonly version