From 2b6fba6e20c7e24f380e97a56f877fcac2af9388 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Thu, 12 Jan 2012 01:35:15 +0100 Subject: [PATCH] integrate new-songs-list within release process switch on patacrep_ tags to obtain the list of new songs --- utils/new-songs-list.sh | 7 ++++++- utils/release.sh | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/utils/new-songs-list.sh b/utils/new-songs-list.sh index 453a2108..6b5a2aae 100755 --- a/utils/new-songs-list.sh +++ b/utils/new-songs-list.sh @@ -3,13 +3,18 @@ # Helper script to get the list of new songs added since the last version # The output is supposed to be copy/pasted into the NEWS item. +GREP="$GREP_OPTIONS" +export GREP_OPTIONS="" + if [ $# -eq 1 ] then VERSION=$1 else # Get current version - VERSION=`git tag | tail -n1` + VERSION=`git tag | grep patacrep | tail -n1` fi # Make new songs list by authors git shortlog $VERSION..master | egrep '^([^ ].*|.*Add song.*)' | sed 's/Add song.*://' | sed 's/\.$//' | sed 's/ (.*)//' | sed 's/\s\s\s*/ /' + +export GREP_OPTIONS="$GREP" diff --git a/utils/release.sh b/utils/release.sh index adcdbdaa..4ee8c806 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -47,7 +47,7 @@ fi; #echo "emacs batch indentation in progress ..." #./utils/indent.sh 2> /dev/null #echo "emacs batch indentation done !" -./utils/rules.py +./utils/rules.py ./utils/resize-cover.py #build all songbooks @@ -72,9 +72,11 @@ git status if [ $# -eq 1 ]; then - git add templates/patacrep-en.tmpl templates/patacrep.tmpl + echo -e "\nversion $MAIN.$MAJOR.$MINOR\n" | cat - NEWS > /tmp/out && mv /tmp/out NEWS + ./utils/new-songs-list.sh | cat - NEWS > /tmp/out && mv /tmp/out NEWS + git add templates/patacrep-en.tmpl templates/patacrep.tmpl NEWS git commit -a -m "patacrep release version $MAIN.$MAJOR.$MINOR" - git tag "patacrep_$MAIN.$MAJOR.$MINOR" + git tag "patacrep_$MAIN.$MAJOR.$MINOR" fi export GREP_OPTIONS="$GREP"