You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/09/04 15:30:27 UTC
[04/15] incubator-brooklyn git commit: make release script takes -y
and checks for existing gpg-agent
make release script takes -y and checks for existing gpg-agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b8869d29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b8869d29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b8869d29
Branch: refs/heads/master
Commit: b8869d2958bdd1e55511c4d52ae5282562089782
Parents: 0d5dc59
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 02:06:47 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 03:23:56 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b8869d29/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index b372560..8cefc77 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -43,6 +43,8 @@ release.
include the suffix. Therefore, turning a release
candidate into a release requires only renaming
the artifacts.
+ -y answers "y" to all questions automatically, to
+ use defaults and make this suitable for batch mode
Specifying the RC number is required. Specifying the version number is
discouraged; if auto detection is not working, then this script is buggy.
@@ -53,15 +55,19 @@ END
###############################################################################
confirm() {
# call with a prompt string or use a default
- read -r -p "${1:-Are you sure? [y/N]} " response
- case $response in
+ if [ "${batch_confirm_y}" == "true" ] ; then
+ true
+ else
+ read -r -p "${1:-Are you sure? [y/N]} " response
+ case $response in
[yY][eE][sS]|[yY])
true
;;
*)
false
;;
- esac
+ esac
+ fi
}
###############################################################################
@@ -83,7 +89,7 @@ detect_version() {
# Argument parsing
rc_suffix=
OPTIND=1
-while getopts "h?v:r:" opt; do
+while getopts "h?v:r:y?" opt; do
case "$opt" in
h|\?)
show_help
@@ -95,6 +101,9 @@ while getopts "h?v:r:" opt; do
r)
rc_suffix=$OPTARG
;;
+ y)
+ batch_confirm_y=true
+ ;;
*)
show_help
exit 1
@@ -169,9 +178,13 @@ echo "Proceeding to build binary release"
set -x
# Set up GPG agent
-eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
-GPG_TTY=$(tty)
-export GPG_TTY GPG_AGENT_INFO
+if ps x | grep [g]pg-agent ; then
+ echo "gpg-agent already running; assuming it is set up and exported correctly."
+else
+ eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
+ GPG_TTY=$(tty)
+ export GPG_TTY GPG_AGENT_INFO
+fi
# Workaround for bug BROOKLYN-1
( cd ${staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )