diff options
| -rwxr-xr-x | create_tarball | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/create_tarball b/create_tarball index f41535c..d122e17 100755 --- a/create_tarball +++ b/create_tarball @@ -134,10 +134,14 @@ tag=`git tag | \ count=`git log $tag --pretty=oneline | wc -l` +pkgver=$TARGET +if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then + pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8) +fi if [ "$SUFFIX" = "true" ]; then - package=$(basename $PWD)-trinity-$TARGET + package=$(basename $PWD)-trinity-$pkgver else - package=trinity-$(basename $PWD)-$TARGET + package=trinity-$(basename $PWD)-$pkgver fi if [ -z "$TDE_REBRAND" ]; then package=${package/tdeio-/kio-} @@ -146,9 +150,6 @@ if [ -z "$TDE_REBRAND" ]; then package=${package/tdm/kdm} package=${package/twin/kwin} fi -if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then - package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8) -fi # Create tarball echo "Package name: $package" @@ -156,6 +157,7 @@ if [ ! -e $TARBALL_DIR/$package.tar$TAR_SUFFIX ]; then echo "Creating tarball in $TARBALL_DIR." echo "# TDE SCM module information" > .tdescminfo echo "Name: $MODULE" >> .tdescminfo + echo "Version: $pkgver" >> .tdescminfo echo "Revision: $branch-$(git rev-parse HEAD)" >> .tdescminfo date +"DateTime: %m/%d/%Y %H:%M" -u -d "@$(git log -1 --pretty=format:"%ct")" >> .tdescminfo trap "rm $TARBALL_DIR/tar-$$; rm .tdescminfo; exit 1" INT |