From 4f22a9bd739604eee9ab9d46530d89b555792d8a Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Fri, 22 Aug 2014 12:46:47 +0200
Subject: [PATCH] Use double-bracket style everywhere in rc*.sh

Standardize on using double-bracket tests in rc*.sh scripts.

Change-Id: Ia118cff0ef04d8c1cf045709a88c71fa961c95b6
---
 rccut.sh      |  6 +++---
 rcdelivery.sh | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rccut.sh b/rccut.sh
index ecd12e9..c5ac45e 100755
--- a/rccut.sh
+++ b/rccut.sh
@@ -19,7 +19,7 @@
 
 set -e
 
-if [ $# -lt 3 ]; then
+if [[ $# -lt 3 ]]; then
     echo "Usage: $0 SHA series projectname [swift_final_version]"
     echo
     echo "Example: $0 HEAD juno keystone"
@@ -30,8 +30,8 @@ fi
 SHA=$1
 SERIES=$2
 PROJECT=$3
-if [ "$PROJECT" == "swift" ]; then
-  if [ $# -eq 4 ]; then
+if [[ "$PROJECT" == "swift" ]]; then
+  if [[ $# -eq 4 ]]; then
     RC1MILESTONE="$4-rc1"
   else
     echo "Missing Swift final version number argument !"
diff --git a/rcdelivery.sh b/rcdelivery.sh
index 88b4175..635cb5e 100755
--- a/rcdelivery.sh
+++ b/rcdelivery.sh
@@ -19,7 +19,7 @@
 
 set -e
 
-if [ $# -lt 3 ]; then
+if [[ $# -lt 3 ]]; then
     echo "Usage: $0 series rcX|final projectname [swift_final_version]"
     echo
     echo "Example: $0 juno final keystone"
@@ -30,8 +30,8 @@ fi
 SERIES=$1
 RC=$2
 PROJECT=$3
-if [ "$PROJECT" == "swift" ]; then
-  if [ $# -eq 4 ]; then
+if [[ "$PROJECT" == "swift" ]]; then
+  if [[ $# -eq 4 ]]; then
     FINALVERSION=$4
   else
     echo "Missing Swift final version number argument !"
@@ -48,8 +48,8 @@ function title {
 
 title "Resolving $PROJECT $SERIES $RC to version"
 
-if [ "$RC" == "final" ]; then
-  if [ "$PROJECT" != "swift" ]; then
+if [[ "$RC" == "final" ]]; then
+  if [[ "$PROJECT" != "swift" ]]; then
     RC1VERSION=`$TOOLSDIR/ms2version.py $PROJECT $SERIES-rc1`
     FINALVERSION=${RC1VERSION:0:6}
   fi
@@ -57,7 +57,7 @@ if [ "$RC" == "final" ]; then
   VERSION=$FINALVERSION
   $TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
 else
-  if [ "$PROJECT" != "swift" ]; then
+  if [[ "$PROJECT" != "swift" ]]; then
     MILESTONE="$SERIES-$RC"
     VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
   else
@@ -75,7 +75,7 @@ git clone git://git.openstack.org/openstack/$PROJECT -b proposed/$SERIES
 cd $PROJECT
 LANG=C git review -s
 
-if [ "$RC" == "final" ]; then
+if [[ "$RC" == "final" ]]; then
   TAGMSG="${PROJECT^} $VERSION"
 else
   TAGMSG="${PROJECT^} $MILESTONE milestone ($VERSION)"
@@ -93,7 +93,7 @@ $TOOLSDIR/similar_tarballs.sh $PROJECT proposed-$SERIES $VERSION
 read -sn 1 -p "Press any key to continue..."
 
 title "Uploading tarball to Launchpad"
-if [ "$RC" == "final" ]; then
+if [[ "$RC" == "final" ]]; then
   $TOOLSDIR/upload_release.py $PROJECT $VERSION
 else
   $TOOLSDIR/upload_release.py $PROJECT $VERSION --milestone=$MILESTONE