diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-11-15 22:32:04 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-11-15 22:32:04 +0100 |
| commit | 43319ae8edf382279720e4d256647c207caa2eb7 (patch) | |
| tree | bdd83010b1899e4ad4e6a9de17c72bf10f63e5e8 | |
| parent | fix merge master conflicts (diff) | |
| parent | yeah I know ... (diff) | |
| download | OpenSMTPD-43319ae8edf382279720e4d256647c207caa2eb7.tar.xz OpenSMTPD-43319ae8edf382279720e4d256647c207caa2eb7.zip | |
Merge branch 'master' into portableopensmtpd-201211152324p1
| -rwxr-xr-x | publish.sh | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 @@ -87,11 +87,13 @@ 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][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][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 |