release.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 2f79d43af5a623ad7a4bef98ccda199b6115a9fd
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 30 11:04:38 2011 -0500
Updating if/then statements after a bash syntax error.
diff --git a/release.sh b/release.sh
index 5b40aa5..040064a 100755
--- a/release.sh
+++ b/release.sh
@@ -269,7 +269,8 @@ else
BUILD_BRANCH="${RELEASE_BRANCH}-test-build"
# delete the branch if it exists, so we can recreate it fresh
EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"`
- if [ -n "$EXISTING_BUILD_BRANCH" ]; then
+ if [ -n "$EXISTING_BUILD_BRANCH" ];
+ then
echo "Deleting remote branch origin/$BUILD_BRANCH"
git branch -D -r "origin/$BUILD_BRANCH"
echo "Deleting local branch $BUILD_BRANCH"
@@ -285,13 +286,15 @@ fi
# If the specified tag already exists remotely and we're in production mode, then
abort. If it exists and
# we're in test mode, delete it
EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"`
-if [ -n "$EXISTING_REMOTE_TAG" ] then
+if [ -n "$EXISTING_REMOTE_TAG" ];
+then
abort "A remote tag named $RELEASE_TAG already exists - aborting"
fi
# See if the specified tag already exists locally - if so, delete it (even if in
production mode).
EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"`
-if [ -n "$EXISTING_LOCAL_TAG" ]; then
+if [ -n "$EXISTING_LOCAL_TAG" ];
+then
abort "A local tag named $RELEASE_TAG already exists - aborting"
fi
Show replies by date