From 7abd8c33af95f94bdbf21f372b372373c294e9f7 Mon Sep 17 00:00:00 2001
From: Guillaume Lambert <guillaume.lambert@orange.com>
Date: Mon, 26 Apr 2021 21:48:38 +0200
Subject: [COMMON] Fix condition bracket bashisms - step 2

pointed out by checkbashisms

$ mycmd=$(tox -e checkbashisms
| grep '(\[\[ foo \]\] should be \[ foo \])'
| sed -e "s@^[^.]*\(.[^ ]*\) line \([0-9]*\) .*@sed -i '\2s/\\\[\\\[\\\(
[^]]*\\\)\\\]\\\]/[\\\1]/g' \1;@")

$ eval $mycmd

plus fix manually quoting hells induced and bash specific regex
and multi-conditions

Issue-ID: OOM-2643
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Ia9626256b5efc837ba12b25d351c8d8a0ba75fb4
---
 .../contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh      | 6 ++++--
 .../contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh | 6 ++++--
 kubernetes/contrib/tools/rke/rke_setup.sh                           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'kubernetes/contrib')

diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
index 1a75bd7a85..67bbfd6c6f 100755
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
@@ -86,9 +86,11 @@ deploy() {
 	target_machine_notice_info
 }
 
-if [[ $# -eq 1 ]] && [[ $1 = "-h" || $1 = "--help" ]]; then
+if [ $# -eq 1 ] && [ "$1" = "-h" ]; then
 	usage
-elif [[ $# -eq 1 ]] && [[ $1 = "--info" ]]; then
+elif [ $# -eq 1 ] && [ "$1" = "--help" ]; then
+	usage
+elif [ $# -eq 1 ] && [ "$1" = "--info" ]; then
        target_machine_notice_info
 else
 	deploy $@
diff --git a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
index 44fe79a0c6..bf2bc121a7 100755
--- a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
+++ b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
@@ -76,9 +76,11 @@ manual_configuration() {
 	generate_config_map $@
 }
 
-if [[ $# -eq 1 ]] && [[ $1 = "-h" || $1 = "--help" ]]; then
+if [ $# -eq 1 ] && [ "$1" = "-h" ]; then
 	usage
-elif [[ $# -eq 0 ]]; then
+if [ $# -eq 1 ] && [ "$1" = "--help" ]; then
+	usage
+elif [ $# -eq 0 ]; then
 	automatic_configuration
 else
 	manual_configuration $@
diff --git a/kubernetes/contrib/tools/rke/rke_setup.sh b/kubernetes/contrib/tools/rke/rke_setup.sh
index 7950e0cc88..2ee123b36a 100755
--- a/kubernetes/contrib/tools/rke/rke_setup.sh
+++ b/kubernetes/contrib/tools/rke/rke_setup.sh
@@ -344,7 +344,7 @@ while getopts ":b:s:e:u:l:k:v" PARAM; do
     esac
 done
 
-if [[ -z $BRANCH ]]; then
+if [ -z $BRANCH ]; then
   usage
   exit 1
 fi
-- 
cgit 1.2.3-korg