summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/components/portal-mariadb
diff options
context:
space:
mode:
authorGuillaume Lambert <guillaume.lambert@orange.com>2021-03-11 21:53:21 +0100
committerKrzysztof Opasiak <k.opasiak@samsung.com>2021-06-29 08:30:09 +0000
commitbd60082c573ba7b741beec6a9844fd5ecb9a0d53 (patch)
tree4d76104e5c3de7f5f5f360131000237c4b8eb4c7 /kubernetes/portal/components/portal-mariadb
parent0fae0aa8378794316c1a1ddd50397a2c6ebc12df (diff)
[COMMON] Fix read -s, echo -e and $'...' bashisms
pointed out by checkbashisms. Issue-ID: OOM-2643 Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com> Change-Id: I527f9b8dcad98a5dd9eb30390d26c95c1d918c09
Diffstat (limited to 'kubernetes/portal/components/portal-mariadb')
-rw-r--r--kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh4
1 files changed, 2 insertions, 2 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 40341bec11..3d5e13ff5a 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
@@ -87,7 +87,7 @@ docker_process_init_files() {
mysql_check_config() {
local toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" ) errors
if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
- mysql_error $'mysqld failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors"
+ mysql_error "$(printf 'mysqld failed while attempting to check config\n\tcommand was: ')${toRun[*]}$(printf'\n\t')$errors"
fi
}
@@ -134,7 +134,7 @@ docker_temp_server_stop() {
# Verify that the minimally required password settings are set for new databases.
docker_verify_minimum_env() {
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
- mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
+ mysql_error "$(printf'Database is uninitialized and password option is not specified\n\tYou need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD')"
fi
}