diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-06-17 14:16:35 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-06-19 09:49:10 +0200 |
| commit | e0f9ba321177863b1d3d1fff47630722ac08569e (patch) | |
| tree | 3f29c13ea750eb55b76a4fd5a9e3761798a704ea | |
| parent | 63362e50371eecbc0a35a00811f97804017b3f3d (diff) | |
| download | scripts-r14.0.x.tar.gz scripts-r14.0.x.zip | |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a810c4d292629e8668538231691e4b6c4274fec8)
| -rwxr-xr-x | create_tarball | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/create_tarball b/create_tarball index 166cf0d..b19dec6 100755 --- a/create_tarball +++ b/create_tarball @@ -134,13 +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 -fi -if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then - package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8) + package=trinity-$(basename $PWD)-$pkgver fi # Create tarball @@ -149,6 +150,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: R$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 |