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:
parent
5e7efab324
commit
c61be4ed90
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue