Switch to double-bracket bash's if

Change-Id: Id2814e9da814a096fc5f6eb8372afb1af49d6f8d

diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh
index 38929ede0cf4462295fb339cbd3954036f4fe0e6..8e07334265e6656e2647ced0508577a0f11c1cb7 100755 (executable)
--- a/maintenance-ci/common/scripts/delete_heat_stack.sh
+++ b/maintenance-ci/common/scripts/delete_heat_stack.sh
@@ -4,7 +4,7 @@ set -ex
 
 OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}"
 
-if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then
+if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then
     virtualenv "${OPENSTACK_CLIENTS_VENV}"
     source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
     pip install openstackclient
@@ -12,7 +12,7 @@ if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then
 fi
 
 function delete_stack() {
-  if [ -z "${VIRTUAL_ENV}" ]; then
+  if [[ -z "${VIRTUAL_ENV}" ]]; then
     source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
     source "${OPENRC_FILE?}"
   fi
@@ -27,9 +27,9 @@ function delete_stack() {
 source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
   source "${OPENRC_FILE?}"
 
-  if [ ! -z "${STACK_NAME}" ] ; then
+  if [[ ! -z "${STACK_NAME}" ]] ; then
       delete_stack ${STACK_NAME}
-  elif [ ! -z "${STACK_PREFIX}" ] ; then
+  elif [[ ! -z "${STACK_PREFIX}" ]] ; then
       for stack in $(openstack stack list -c 'Stack Name' -f value) ; do
           if [[ ${stack} == ${STACK_PREFIX}* ]] ; then
               delete_stack ${stack}

diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh
index 93ea46b92e8878f93f7c18422f5a087f2fdea12e..80054b58ced1656e7969b875747caeb22d84a9f9 100755 (executable)
--- a/maintenance-ci/common/scripts/deploy_heat_stack.sh
+++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh
@@ -4,7 +4,7 @@ set -ex
 
 OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}"
 
-if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then
+if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then
     virtualenv "${OPENSTACK_CLIENTS_VENV}"
     source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
     pip install openstackclient
@@ -12,13 +12,13 @@ if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then
 fi
 
 parameter_string=""
-if [ ! -z "${FLAVOR_NAME}" ] ; then
+if [[ ! -z "${FLAVOR_NAME}" ]] ; then
   parameter_string="$parameter_string --parameter \"flavor=${FLAVOR_NAME}\""
 fi
-if [ ! -z "${IMAGE_NAME}" ] ; then
+if [[ ! -z "${IMAGE_NAME}" ]] ; then
   parameter_string="$parameter_string --parameter \"image=${IMAGE_NAME}\""
 fi
-if [ ! -z "${JENKINS_LABELS}" ] ; then
+if [[ ! -z "${JENKINS_LABELS}" ]] ; then
   parameter_string="$parameter_string --parameter \"jenkins_labels=${JENKINS_LABELS}\""
 fi