From 87c8dfb8b0b0fe830f9fc0652620e45fb59b24a6 Mon Sep 17 00:00:00 2001 From: Gilles Chehade Date: Thu, 15 Nov 2012 22:27:42 +0100 Subject: fix fuckup in publish.sh --- publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish.sh b/publish.sh index a6f23a1b..bc33d449 100755 --- a/publish.sh +++ b/publish.sh @@ -79,7 +79,7 @@ snapshot() REMOTEDIR=/var/www/virtual/org.opensmtpd/archives/ TARBALL=`build_tarball ${1}` - SNAPSHOT=opensmtpd-`date +%Y%m%d%H%M%S` + SNAPSHOT=opensmtpd-`date +%Y%m%d%H%M` if test "${1}" = "portable"; then SNAPSHOT=${SNAPSHOT}p1 fi -- cgit v1.2.3-59-g8ed1b From 822bf9efaf4b0e90b9c45368aaef6fe662dba3e3 Mon Sep 17 00:00:00 2001 From: Gilles Chehade Date: Thu, 15 Nov 2012 22:30:28 +0100 Subject: really fix fuckup --- publish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish.sh b/publish.sh index bc33d449..a1248c5f 100755 --- a/publish.sh +++ b/publish.sh @@ -87,9 +87,9 @@ snapshot() mv ${FILES}/${TARBALL} ${FILES}/${SNAPSHOT}.tar.gz if test "${1}" = "master"; then - LASTTAGS=`git tag |grep '^opensmtpd-[0-9]*' | grep -v '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` + LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9]*' | grep -v '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` else - LASTTAGS=`git tag |grep '^opensmtpd-[0-9]*' | grep '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` + LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9]*' | grep '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` fi CHANGELOG=`git log $LASTTAGS` -- cgit v1.2.3-59-g8ed1b From 427229d7c123921ec1cf66687059a5640b638c05 Mon Sep 17 00:00:00 2001 From: Gilles Chehade Date: Thu, 15 Nov 2012 22:31:49 +0100 Subject: yeah I know ... --- publish.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/publish.sh b/publish.sh index a1248c5f..c829fca7 100755 --- a/publish.sh +++ b/publish.sh @@ -87,11 +87,13 @@ snapshot() mv ${FILES}/${TARBALL} ${FILES}/${SNAPSHOT}.tar.gz if test "${1}" = "master"; then - LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9]*' | grep -v '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` + LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9][0-9]*' | grep -v '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` else - LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9]*' | grep '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` + LASTTAGS=`git tag |grep '^opensmtpd-[0-9][0-9][0-9]*' | grep '[0-9]p[0-9]$' | tail -2 | tr '\n' '@' | sed 's/@$//g'| sed 's/@/../g'` fi + echo git log $LASTTAGS + CHANGELOG=`git log $LASTTAGS` if test "${CHANGELOG}" = ""; then echo "Error: nothing new in this snapshot, I won't publish it !" >&2 -- cgit v1.2.3-59-g8ed1b