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

internal/version/version.go

@@ -120,7 +120,6 @@ const (
 	vFmtGOARCHHdr = "GOARCH: " + runtime.GOARCH
 	vFmtGOARMHdr  = "GOARM: "
 	vFmtGOMIPSHdr = "GOMIPS: "
-	vFmtMainHdr   = "Main module:"
 	vFmtDepsHdr   = "Dependencies:"
 )
 
@@ -172,8 +171,6 @@ func Verbose() (v string) {
 		return b.String()
 	}
 
-	aghstrings.WriteToBuilder(b, nl, vFmtMainHdr, nltb, fmtModule(&info.Main))
-
 	if len(info.Deps) == 0 {
 		return b.String()
 	}

scripts/README.md

@@ -89,10 +89,11 @@ Optional environment:
  *  `VERBOSE`: verbosity level.  `1` shows every command that is run and every
     Go package that is processed.  `2` also shows subcommands and environment.
     The default value is `0`, don't be verbose.
+ *  `VERSION`: release version.  Will be set by `version.sh` if it is unset or
+    if it has the default `Makefile` value of `v0.0.0`.
 
 Required environment:
  *  `CHANNEL`: release channel, see above.
- *  `VERSION`: release version.
 
  ###  `go-deps.sh`: Install Backend Dependencies
 

scripts/make/build-release.sh

@@ -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
 

scripts/make/go-build.sh

@@ -56,10 +56,13 @@ in
 	;;
 esac
 
-# Require the version to be set.
-#
-# TODO(a.garipov): Additional validation?
-version="$VERSION"
+# Check VERSION against the default value from the Makefile.  If it is that, use
+# the version calculation script.
+version="${VERSION:-}"
+if [ "$version" = 'v0.0.0' ] || [ "$version" = '' ]
+then
+	version="$( sh ./scripts/make/version.sh )"
+fi
 readonly version
 
 # Set date and time of the current build unless already set.

scripts/make/version.sh

@@ -84,6 +84,9 @@ in
 	# minor release.  If the current commit is the new minor release,
 	# num_commits_since_minor is zero.
 	num_commits_since_minor="$( git rev-list "${last_minor_zero}..HEAD" | wc -l )"
+	# The output of darwin's implementation of wc needs to be trimmed from
+	# redundant spaces.
+	num_commits_since_minor="$( echo ${num_commits_since_minor} | tr -d '[:space:]' )"
 	readonly num_commits_since_minor
 
 	# next_minor is the next minor release version.
@@ -126,7 +129,7 @@ in
 esac
 
 # Finally, make sure that we don't output invalid versions.
-if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-[ab]\.[0-9]+)?(\+[[:xdigit:]]+)?' -q
+if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-[ab]\.[0-9]+)?(\+[[:xdigit:]]+)?$' -q
 then
 	echo "generated an invalid version '$version'" 1>&2