Repository: incubator-edgent Updated Branches: refs/heads/master 4744f56bb -> b42c59d65
[Edgent-385] fix stage_release_candidate.sh - stage the correct file to binaries/LICENSE - handle svn case of add of initial staged edgent-<ver> dir - fix the svn commit cmd's msg quoting Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b42c59d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b42c59d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b42c59d6 Branch: refs/heads/master Commit: b42c59d65ab0a792c3488de457a67a0c70db3f49 Parents: 4744f56 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Mon Feb 27 14:02:09 2017 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Mon Feb 27 16:33:27 2017 -0500 ---------------------------------------------------------------------- buildTools/stage_release_candidate.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b42c59d6/buildTools/stage_release_candidate.sh ---------------------------------------------------------------------- diff --git a/buildTools/stage_release_candidate.sh b/buildTools/stage_release_candidate.sh index 51f68ef..e726107 100755 --- a/buildTools/stage_release_candidate.sh +++ b/buildTools/stage_release_candidate.sh @@ -109,10 +109,14 @@ cp RELEASE_NOTES ${SVN_RC_DIR} cp ${BUNDLE_DIR}/*-src.* ${SVN_RC_DIR} mkdir -p ${SVN_RC_DIR}/binaries -cp LICENSE ${SVN_RC_DIR}/binaries +cp binary-release/LICENSE ${SVN_RC_DIR}/binaries cp ${BUNDLE_DIR}/*-bin.* ${SVN_RC_DIR}/binaries -(set -x; svn add ${SVN_RC_DIR}) +if [ ! `svn info --show-item url ${SVN_VER_DIR} 2>/dev/null` ]; then + (set -x; svn add ${SVN_VER_DIR}) +else + (set -x; svn add ${SVN_RC_DIR}) +fi echo (set -x; svn status ${SVN_DEV_EDGENT}) @@ -121,7 +125,7 @@ echo echo "If you choose not to proceed, you can later run the following to commit the changes:" echo " (cd ${SVN_DEV_EDGENT}; svn commit -m \"Add Apache Edgent ${VER}-incubating/rc${RC_NUM}\")" confirm "Proceed to commit the changes?" || exit -(set -x; cd ${SVN_DEV_EDGENT}; svn commit -m \"Add Apache Edgent ${VER}-incubating/rc${RC_NUM}\") +(set -x; cd ${SVN_DEV_EDGENT}; svn commit -m "Add Apache Edgent ${VER}-incubating/rc${RC_NUM}") echo echo "The KEYS and ${RC_TAG} have been staged to ${EDGENT_ASF_SVN_RC_URL}" \ No newline at end of file
