diff options
| author | Martin Roth <martinroth@google.com> | 2017-04-04 15:05:24 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-05-16 10:54:06 +0200 |
| commit | 7a00a63829881a099d679de13d725d94ea658ed9 (patch) | |
| tree | c330fa45372788fe14f7cb14e461f60937127a84 /util | |
| parent | ff2938ff4b63bedae1ab402b8f8f6272b3120a35 (diff) | |
| download | coreboot-7a00a63829881a099d679de13d725d94ea658ed9.tar.xz | |
util/release: Update build-release script
- Put parameter comments and help text in the same order as the actual
parameters.
- Don't clone a new release tree from coreboot.org if a tree already
exists.
- Change COMMIT_ID parameter from optional to required. If it was
omitted previously, the head of the master branch would be used.
Change-Id: Ifa434a4911dec777004788e3cf4e3436875d929b
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/19126
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/release/build-release | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/util/release/build-release b/util/release/build-release index 895285e2e9..089984b595 100755 --- a/util/release/build-release +++ b/util/release/build-release @@ -1,8 +1,8 @@ #!/bin/bash # ${VERSION_NAME}: new version name -# ${GPG_KEY_ID}: gpg key id (if not don't sign) -# ${USERNAME}: username (if not default to https) # ${COMMIT_ID}: commit id (if not master) +# ${USERNAME}: username (if not default to https) +# ${GPG_KEY_ID}: gpg key id (if not don't sign) VERSION_NAME=$1 COMMIT_ID=$2 USERNAME=$3 @@ -16,14 +16,14 @@ LANG=C TZ=UTC export LC_ALL LANG TZ -if [ -z "$VERSION_NAME" ] || [ "$VERSION_NAME" = "--help" ]; then - echo "usage: $0 <version> [commit id] [gpg key id] [username]" +if [ -z "$VERSION_NAME" ] || [ "$VERSION_NAME" = "--help" ] || [ -z "$COMMIT_ID" ]; then + echo "usage: $0 <version> <commit id> [username] [gpg key id]" echo "Tags a new coreboot version and creates a tar archive" echo echo "version: New version name to tag the tree with" echo "commit id: check out this commit-id after cloning the coreboot tree" - echo "gpg key id: used to tag the version, and generate a gpg signature" echo "username: clone the tree using ssh://USERNAME - defaults to https://" + echo "gpg key id: used to tag the version, and generate a gpg signature" exit 1 fi @@ -34,10 +34,12 @@ if ! tar --sort=name -cf /dev/null /dev/null 2>/dev/null ; then exit 1 fi -if [ -n "${USERNAME}" ]; then - git clone "ssh://${USERNAME}@review.coreboot.org:29418/coreboot.git" "coreboot-${VERSION_NAME}" -else - git clone https://review.coreboot.org/coreboot.git "coreboot-${VERSION_NAME}" +if [ ! -d "coreboot-${VERSION_NAME}" ]; then + if [ -n "${USERNAME}" ]; then + git clone "ssh://${USERNAME}@review.coreboot.org:29418/coreboot.git" "coreboot-${VERSION_NAME}" + else + git clone https://review.coreboot.org/coreboot.git "coreboot-${VERSION_NAME}" + fi fi cd "coreboot-${VERSION_NAME}" || exit 1 |