Improving release scripts

Author: dobladez

finish-release.sh

@@ -17,8 +17,14 @@ echo -n "commiting release notes and readme.  enter to continue:" && read x \
 && echo -n "Peform release.  enter to continue:" && read x \
 && mvn release:clean \
 && mvn release:prepare -Dgpg.keyname=02FCB552 \
-&& mvn release:perform -Dgpg.keyname=02FCB552 \
+&& git checkout develop; git merge "release-${new-version}" \
+&& git checkout master; git merge "v${new-version}" \
+&& mvn release:perform -Dgpg.keyname=02FCB552
+
+# \
 #&& mvn nexus:staging-close \
 #&& mvn nexus:staging-promote \
-&& git flow release finish -n $version
+
+
+#&& git flow release finish -n $version
 

start-release.sh

@@ -15,15 +15,19 @@ echo "Start release of $version, previous version is $previous_version"
 echo ""
 echo ""
 
-git flow release start $version || exit 1
+git co -b "release-$version" || exit 1
+
+#git flow release start $version || exit 1
 
 echo ""
 echo ""
 echo "Changes since $previous_version"
-git log --online  v$previous_version..
+git log --oneline  v$previous_version..
 echo ""
 echo ""
-echo "Now edit ReleaseNotes and README"
+echo "Press [enter] to edit ReleaseNotes and README..."
+read
+
 
 $EDITOR ReleaseNotes.md
 $EDITOR README.md