summaryrefslogtreecommitdiff
path: root/tools/release.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/release.sh')
-rwxr-xr-xtools/release.sh17
1 files changed, 6 insertions, 11 deletions
diff --git a/tools/release.sh b/tools/release.sh
index 26be1511..e7fbc6ce 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,8 +1,10 @@
-#!/bin/sh -e
+#!/bin/bash
# release.sh: openocd release process automation
# Copyright (C) 2009 by Zachary T Welch <zw@superlucidity.net>
# Release under the GNU GPL v2 (or later versions).
+# FIXME Remove more bash-isms. Fix errors making "ash -e" lose.
+
## set these to control the build process
#CONFIG_OPTS=""
#MAKE_OPTS=""
@@ -13,7 +15,7 @@
## The default is the current user name, as found by the 'id' command.
#RELEASE_TAG="$(id -un)"
-source "tools/release/helpers.sh"
+. "tools/release/helpers.sh"
VERSION_SH="tools/release/version.sh"
@@ -238,13 +240,6 @@ do_release_step_rebranch() {
git branch -d "${OLD_BRANCH}"
}
-do_release_step_0() { do_release_step_branch; }
-do_release_step_1() { do_release_step_tag; }
-do_release_step_2() { do_release_step_bump; }
-do_release_step_3() { do_release_step_news; }
-do_release_step_4() { do_release_step_package; }
-do_release_step_5() { do_release_step_rebranch; }
-
do_release_setup() {
echo "Starting $CMD for ${RELEASE_VERSION}..."
[ "${RELEASE_TYPE}" ] || \
@@ -274,7 +269,7 @@ do_countdown() {
do_branch() {
do_release_setup
local i=
- for i in 0 2 5; do
+ for i in branch bump rebranch; do
"do_release_step_${i}"
done
}
@@ -284,7 +279,7 @@ do_release() {
do_release_setup
do_release_check
local i=
- for i in $(seq 0 5); do
+ for i in branch tag bump news package rebranch; do
"do_release_step_${i}"
done
}