projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
version-gen.sh
diff --git
a/version-gen.sh
b/version-gen.sh
index
b09be8e
..
d7c6a76
100755
(executable)
--- a/
version-gen.sh
+++ b/
version-gen.sh
@@
-1,13
+1,13
@@
#!/bin/sh
#!/bin/sh
-DEFAULT_VERSION="5.5.
0
.git"
+DEFAULT_VERSION="5.5.
1
.git"
-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
+if [ -d .git ]; then
+ VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
+fi
if test -z "$VERSION"; then
VERSION="$DEFAULT_VERSION"
fi
if test -z "$VERSION"; then
VERSION="$DEFAULT_VERSION"
fi
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
-
printf "%s" "$VERSION"
printf "%s" "$VERSION"