You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by ns...@apache.org on 2013/03/10 22:05:10 UTC
[2/3] git commit: Minor improvements
Minor improvements
Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/185ca0dc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/185ca0dc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/185ca0dc
Branch: refs/heads/master
Commit: 185ca0dc37451dd2878e4886339d27238eef2b15
Parents: 29ec1c8
Author: Noah Slater <ns...@apache.org>
Authored: Sun Mar 10 21:04:46 2013 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sun Mar 10 21:04:46 2013 +0000
----------------------------------------------------------------------
release/build_candidate.sh | 10 ++--------
release/build_candidate_aws.sh | 14 ++++----------
release/build_cve_list.sh | 6 ------
release/check_docs.sh | 8 +-------
release/publish_candidate.sh | 21 +++++++++------------
release/tag_candidate.sh | 12 +++---------
6 files changed, 19 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/build_candidate.sh
----------------------------------------------------------------------
diff --git a/release/build_candidate.sh b/release/build_candidate.sh
index d2184d0..de90c75 100755
--- a/release/build_candidate.sh
+++ b/release/build_candidate.sh
@@ -12,23 +12,17 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
if test -n "$1"; then
branch=$1
else
- echo "error: no branch"
+ echo "error: no branch"
exit 1
fi
if test -n "$2"; then
version=$2
else
- echo "error: no version"
+ echo "error: no version"
exit 1
fi
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/build_candidate_aws.sh
----------------------------------------------------------------------
diff --git a/release/build_candidate_aws.sh b/release/build_candidate_aws.sh
index 56935fb..a324864 100755
--- a/release/build_candidate_aws.sh
+++ b/release/build_candidate_aws.sh
@@ -12,37 +12,31 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
if test -n "$1"; then
identity_file=$1
else
- echo "error: no identity file"
+ echo "error: no identity file"
exit 1
fi
if test -n "$2"; then
connection=$2
else
- echo "error: no connection string"
+ echo "error: no connection string"
exit 1
fi
if test -n "$3"; then
branch=$3
else
- echo "error: no branch"
+ echo "error: no branch"
exit 1
fi
if test -n "$4"; then
version=$4
else
- echo "error: no version"
+ echo "error: no version"
exit 1
fi
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/build_cve_list.sh
----------------------------------------------------------------------
diff --git a/release/build_cve_list.sh b/release/build_cve_list.sh
index 25b4854..14c80b8 100755
--- a/release/build_cve_list.sh
+++ b/release/build_cve_list.sh
@@ -12,12 +12,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
cd `dirname $0`
basename=`basename $0`
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/check_docs.sh
----------------------------------------------------------------------
diff --git a/release/check_docs.sh b/release/check_docs.sh
index 1d139e2..b3e1bfa 100755
--- a/release/check_docs.sh
+++ b/release/check_docs.sh
@@ -12,16 +12,10 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
if test -n "$1"; then
cve_list_file=$1
else
- echo "error: no remote CVE list file"
+ echo "error: no remote CVE list file"
exit 1
fi
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/publish_candidate.sh
----------------------------------------------------------------------
diff --git a/release/publish_candidate.sh b/release/publish_candidate.sh
index aa21092..b486b5e 100755
--- a/release/publish_candidate.sh
+++ b/release/publish_candidate.sh
@@ -12,32 +12,26 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
EMAIL_TPL=../email/vote_release.txt
if test -n "$1"; then
candidate_dir=$1
else
- echo "error: no candidate directory"
+ echo "error: no candidate directory"
exit
fi
if test -n "$2"; then
version=$2
else
- echo "error: no version"
+ echo "error: no version"
exit
fi
if test -n "$3"; then
candidate=$3
else
- echo "error: no candidate number"
+ echo "error: no candidate number"
exit
fi
@@ -103,9 +97,12 @@ checkin: sign
cd \$(SVN_DIR) && svn ci -m \$(COMMIT_MSG_FILES)
sign: copy
- \$(GPG) < \$(SVN_TGZ_FILE) > \$(SVN_TGZ_FILE).asc
- md5sum \$(SVN_TGZ_FILE) > \$(SVN_TGZ_FILE).md5
- sha1sum \$(SVN_TGZ_FILE) > \$(SVN_TGZ_FILE).sha
+ cd \$(SVN_DIR) && \
+ \$(GPG) < \$(PACKAGE).tar.gz > \$(PACKAGE).tar.gz.asc
+ cd \$(SVN_DIR) && \
+ md5sum \$(PACKAGE).tar.gz > \$(PACKAGE).tar.gz.md5
+ cd \$(SVN_DIR) && \
+ sha1sum \$(PACKAGE).tar.gz > \$(PACKAGE).tar.gz.sha
copy: check
cp \$(CANDIDATE_TGZ_FILE) \$(SVN_TGZ_FILE)
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/185ca0dc/release/tag_candidate.sh
----------------------------------------------------------------------
diff --git a/release/tag_candidate.sh b/release/tag_candidate.sh
index 1a998e8..8fa65fd 100755
--- a/release/tag_candidate.sh
+++ b/release/tag_candidate.sh
@@ -12,30 +12,24 @@
# License for the specific language governing permissions and limitations under
# the License.
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
if test -n "$1"; then
version=$1
else
- echo "error: no version"
+ echo "error: no version"
exit
fi
if test -n "$2"; then
candidate=$2
else
- echo "error: no candidate number"
+ echo "error: no candidate number"
exit
fi
if test -n "$3"; then
gpg_key=$3
else
- echo "error: no GPG key"
+ echo "error: no GPG key"
exit
fi