Get version script: allow running without path parameter
o9000 mrovi9000@gmail.com
1 files changed,
3 insertions(+),
3 deletions(-)
jump to
M
get_version.sh
→
get_version.sh
@@ -33,10 +33,10 @@ 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 else - VERSION=$(head -n 1 ${2}ChangeLog | cut -d ' ' -f 2) - if [ $VERSION = "master" ] + VERSION=$( (head -n 1 ${2}ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 2) + if [ "$VERSION" = "master" ] then - VERSION=$VERSION-$(head -n 1 ${2}ChangeLog | cut -d ' ' -f 1) + VERSION=$VERSION-$( (head -n 1 ${2}ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 1) fi fi