Skip to content

Commit 6a5f026

Browse files
Daniil Fedotovmichaelklishin
authored andcommitted
Equality operators and trimming extension
1 parent 06fa298 commit 6a5f026

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

scripts/rabbitmq-server

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,13 @@ fi
9595

9696
set -e
9797

98-
strip_trailing_config_or_conf() {
99-
local dir=$(dirname $1)
100-
local filename_without_conf=$(basename $1 .conf)
101-
local filename_without_config=$(basename $filename_without_conf .config)
98+
RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}"
10299

103-
echo "$dir/$filename_without_config"
104-
}
105-
106-
RABBITMQ_CONFIG_FILE_NOEX=$(strip_trailing_config_or_conf $RABBITMQ_CONFIG_FILE)
107-
108-
if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" == "${RABBITMQ_CONFIG_FILE}" ]; then
100+
if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then
109101
if [ -f "${RABBITMQ_CONFIG_FILE}" ]; then
110102
RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}"
111103
fi
112-
elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" == "${RABBITMQ_CONFIG_FILE}" ]; then
104+
elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
113105
RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \
114106
-conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
115107
-conf_script_dir `dirname $0` \

0 commit comments

Comments
 (0)