nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ChangeLog is in the same directory of get_version.sh, get it from there

Browse source
This commit is contained in:
o9000 2017-06-26 22:46:17 +02:00
parent d05d5f594b
commit cfc43685a4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
get_version.sh
View file

@ -33,10 +33,11 @@ then
fi fi
VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
else else
VERSION=$( (head -n 1 ${2}ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 2) SCRIPT_DIR=$(dirname "$0")
VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
if [ "$VERSION" = "master" ] if [ "$VERSION" = "master" ]
then then
VERSION=$VERSION-$( (head -n 1 ${2}ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 1) VERSION=$VERSION-$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 1)
fi fi
fi fi