]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
make_dist.sh: improve version calc
authorSage Weil <sage@redhat.com>
Mon, 1 Jun 2015 18:19:46 +0000 (11:19 -0700)
committerSage Weil <sage@redhat.com>
Mon, 1 Jun 2015 18:19:46 +0000 (11:19 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
make_dist.sh

index 1724e6b407bee6cae9c1c0f5f84c5fc329659b26..731ed1c499dbd1b05d5c0c4065f0e6dbf9098745 100755 (executable)
@@ -6,9 +6,11 @@ if [ ! -d .git ]; then
 fi
 
 version=$1
-[ -z "$version" ] && version=`git describe | cut -c 2-`
+[ -z "$version" ] && version=`git describe --match 'v*' | sed 's/^v//'`
 outfile="ceph-$version"
 
+echo "version $version"
+
 # update submodules
 echo "updating submodules..."
 force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)