Merge "[COMMON] Fix brace expansion bashisms"

2 files changed, 4 insertions, 4 deletions

diff --git a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index b416fdd5d8..b07d127ff8 100644
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -106,7 +106,7 @@ docker_temp_server_start() {
 	"$@" --skip-networking --socket="${SOCKET}" &
 	mysql_note "Waiting for server startup"
 	local i
-	for i in {30..0}; do
+	for i in $(seq 30 -1 0); do
 		# only use the root password if the database has already been initializaed
 		# so that it won't try to fill in a password file when it hasn't been set yet
 		extraArgs=""
diff --git a/kubernetes/robot/scripts/etescript/hvves-etescript.sh b/kubernetes/robot/scripts/etescript/hvves-etescript.sh
index b47051f7e2..63e90cdec6 100755
--- a/kubernetes/robot/scripts/etescript/hvves-etescript.sh
+++ b/kubernetes/robot/scripts/etescript/hvves-etescript.sh
@@ -49,21 +49,21 @@ create_pkcs12_ca_and_server () {
 }
 
 copy_server_certs_to_hvves () {
-	for f in {ca.p12,server.p12}
+	for f in ca.p12 server.p12
 	do
 		kubectl cp $1/$f $2/$3:$4
 	done
 }
 
 copy_client_certs_to_robot () {
-	for f in {ca.pem,client.key,client.pem}
+	for f in ca.pem client.key client.pem
 	do
                 kubectl cp $1/$f $2/$3:$4
         done
 }
 
 cleanup () {
-	rm -f $1/{ca,server,client}.???
+	rm -f $1/ca.??? $1/server.??? s$1/client.???
 }