Skip to content

Commit 11d9bef

Browse files
Merge pull request #14860 from rabbitmq/fix-selenium-keycloak
Fix shellcheck warnings in selenium component scripts
2 parents fa8f32c + b6a92ec commit 11d9bef

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

selenium/bin/components/devkeycloak-proxy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
24

35
ensure_devkeycloak-proxy() {

selenium/bin/components/forward-proxy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
24

35
ensure_forward-proxy() {

selenium/bin/components/other-rabbitmq

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ start_local_other_rabbitmq() {
6969

7070
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp/other$MOUNT_RABBITMQ_CONF"
7171
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/other/etc/rabbitmq/
72-
RABBITMQ_ENABLED_PLUGINS=`cat /tmp/other/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'`
72+
RABBITMQ_ENABLED_PLUGINS=$(cat /tmp/other/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}')
7373
print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"
7474

7575
${BIN_DIR}/gen-advanced-config "${PROFILES_FOR_OTHER}" ${RABBITMQ_CONFIG_DIR} $OTHER_ENV_FILE /tmp/other$MOUNT_ADVANCED_CONFIG

selenium/bin/components/prodkeycloak-proxy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
24

35
ensure_prodkeycloak-proxy() {
@@ -7,6 +9,7 @@ ensure_prodkeycloak-proxy() {
79
start_prodkeycloak-proxy
810
fi
911
}
12+
1013
init_prodkeycloak-proxy() {
1114
HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/prodkeycloak-proxy
1215
PROXY_HOSTNAME=prodkeycloak-proxy
@@ -17,6 +20,7 @@ init_prodkeycloak-proxy() {
1720
print "> PROXY_PORT: ${PROXY_PORT}"
1821

1922
print "> HTTPD_DOCKER_IMAGE: ${HTTPD_DOCKER_IMAGE}"
23+
}
2024

2125
start_prodkeycloak-proxy() {
2226
begin "Starting prodkeycloak-proxy ..."
@@ -27,7 +31,7 @@ start_prodkeycloak-proxy() {
2731
MOUNT_HTTPD_CONFIG_DIR=$CONF_DIR/httpd
2832

2933
mkdir -p $MOUNT_HTTPD_CONFIG_DIR
30-
${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
34+
${BIN_DIR}/gen-httpd-conf" "${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
3135
print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
3236
cp ${HTTPD_CONFIG_DIR}/.htpasswd $MOUNT_HTTPD_CONFIG_DIR
3337

selenium/bin/components/proxy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
24

35
ensure_proxy() {

selenium/bin/components/rabbitmq

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/usr/bin/env bash
22

3-
SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
53

64
init_rabbitmq() {
75
RABBITMQ_CONFIG_DIR=${TEST_CONFIG_DIR}
@@ -70,7 +68,7 @@ start_local_rabbitmq() {
7068

7169
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF"
7270
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
73-
RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'`
71+
RABBITMQ_ENABLED_PLUGINS=$(cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}')
7472
print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"
7573

7674
${BIN_DIR}/gen-advanced-config "${PROFILES}" ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG

0 commit comments

Comments
 (0)