On branch Bug2720Fix Changes to be committed: modified: support/version lines 20 and 21 to correct location of rpm/version files <boblfoot@gmail.com> 20150319

This commit is contained in:
Bob Lightfoot 2015-03-19 05:46:37 -04:00 committed by Jaroslav Kysela
parent 5e7efab324
commit c61be4ed90

View file

@ -17,8 +17,8 @@ if [ -d ".git" ]; then
VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/")
elif [ -f "$(dirname "$0")/../debian/changelog" ]; then
VER=$(head -1 "$(dirname "$0")/../debian/changelog" | awk '{ print $2 }' | tr -d '()' | cut -d '-' -f 1)
elif [ -r "$(dirname "$0")/rpm/version" ]; then
VER=$(cat "$(dirname "$0")/rpm/version")
elif [ -r "$(dirname "$0")/../rpm/version" ]; then
VER=$(cat "$(dirname "$0")/../rpm/version")
else
VER="0.0.0~unknown"
fi