From cded00c47ceecf521debec4b3afdb029ca4163ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 19 Oct 2016 17:34:11 +0200 Subject: [PATCH] Update generator script --- NOW.spec | 2 -- gen.sh | 28 +++++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/NOW.spec b/NOW.spec index b759d2d..383720c 100644 --- a/NOW.spec +++ b/NOW.spec @@ -161,5 +161,3 @@ fi %changelog -* Wed Oct 19 2016 František Dvořák - 0.0.1-0.20160928git4cd4d76 -- Initial package diff --git a/gen.sh b/gen.sh index 3fa517e..15678eb 100755 --- a/gen.sh +++ b/gen.sh @@ -6,21 +6,31 @@ else git clone https://github.com/CESNET/NOW/ fi -tag=`cd NOW; git rev-parse HEAD` -short=`echo ${tag} | cut -c 1-7` +commit=`cd NOW; git rev-parse HEAD` +datecommit=`cd NOW; git log -n1 --format='%ai' HEAD` +short=`echo ${commit} | cut -c 1-7` v=`cd NOW; ruby -r./version.rb -e 'print Now::VERSION'` -rel=0.`cd NOW; git show --format='format:%ai' HEAD | head -n 1 | cut -f1 -d' ' | sed 's/-//g'`git${short} +release=${release:-'0.'} +if echo "${release}" | grep -q '\.$'; then + release=${release}.`date --utc --date="${datecommit}" '+%Y%m%d'`git${short} +fi -rm -rf NOW-${tag}/ -cp -a NOW/ NOW-${tag}/ -tar --exclude .git -cf - NOW-${tag}/ | pigz --best > NOW-${short}.tar.gz -rm -rf NOW-${tag}/ +rm -rf NOW-${commit}/ +cp -a NOW/ NOW-${commit}/ +tar --exclude .git -cf - NOW-${commit}/ | pigz --best > NOW-${short}.tar.gz +rm -rf NOW-${commit}/ cp -vp NOW-${short}.tar.gz NOW.conf README.Fedora now.fc now.te ~/rpmbuild/SOURCES/ +packager="Jenkins Builder " +specdate=`LC_ALL=C date '+%a %b %d %Y'` sed -i \ - -e "s/\(%global commit0 \+\).*/\1${tag}/" \ + -e "s/\(%global commit0 \+\).*/\1${commit}/" \ -e "s/\(Version: \+\).*/\1${v}/" \ - -e "s/\(Release: \+\).*/\1${rel}/" \ + -e "s/\(Release: \+\).*/\1${release}/" \ NOW.spec +cat >> NOW.spec <