Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix "make dist" to include version number, docouple it from rpm packaging
[vpp.git]
/
src
/
scripts
/
version
diff --git
a/src/scripts/version
b/src/scripts/version
index
d92eb8b
..
d8728a9
100755
(executable)
--- a/
src/scripts/version
+++ b/
src/scripts/version
@@
-4,16
+4,12
@@
path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
cd "$path"
cd "$path"
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
- vstring=$(git describe)
-elif [ -f .version ]; then
+if [ -f .version ]; then
vstring=$(cat .version)
else
vstring=$(cat .version)
else
- if [ -f ../rpm/*.gz ]; then
- vstring=$(ls ../rpm/*.gz)
- else
- exit 1
+ vstring=$(git describe)
+ if [ $? != 0 ]; then
+ exit 1
fi
fi
fi
fi