You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/07/10 10:40:46 UTC

[5/5] wicket git commit: Fixed generation of promotion script, added release-announcement.txt to staging

Fixed generation of promotion script, added release-announcement.txt to staging


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6f66349a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6f66349a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6f66349a

Branch: refs/heads/master
Commit: 6f66349a8d5e78457ceecd6f1e60b737000fed3c
Parents: cc65404
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jul 10 10:40:44 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jul 10 10:41:02 2015 +0200

----------------------------------------------------------------------
 release-dashorst.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/6f66349a/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index b107662..981a43c 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -53,7 +53,7 @@ echo -n "Promoting release $version
 Actions about to be performed:
 ------------------------------
 
-$(cat $0 | tail -n +14)
+$(cat \$0 | tail -n +14)
 
 ------------------------------------------
 Press enter to continue or CTRL-C to abort"
@@ -80,7 +80,7 @@ git checkout $GIT_BRANCH
 mvn release:update-versions --batch-mode
 find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
 find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
-git add `find . ! \( -type d -name "target" -prune \) -name pom.xml`
+git add \` find . ! \( -type d -name "target" -prune \) -name pom.xml \`
 git commit -m "Start next development version"
 git push
 
@@ -255,7 +255,7 @@ function generate_announce_email {
     " > release-announce.txt
 
     cat /tmp/release-$version-sigs.txt >> release-announce.txt
-	git add release-announce.sh
+	git add release-announce.txt
 }
 
 # the branch on which the code base lives for this version (master is