daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into websvc-confin-manager

Browse Source
This commit is contained in:
Ainar Garipov
2022-09-30 15:27:54 +03:00
parent c20ca9b85e 4d404b887f
commit b448a3b5dc
162 changed files with 2095 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/make/version.sh
View File

@@ -85,11 +85,7 @@ in
# num_commits_since_minor is the number of commits since the last new
# 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:]' )"
num_commits_since_minor="$( git rev-list --count "${last_minor_zero}..HEAD" )"
readonly num_commits_since_minor
# next_minor is the next minor release version.