File tree Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Original file line number Diff line number Diff line change 95
95
96
96
set -e
97
97
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% .* } "
102
99
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
109
101
if [ -f " ${RABBITMQ_CONFIG_FILE} " ]; then
110
102
RABBITMQ_CONFIG_ARG=" -config ${RABBITMQ_CONFIG_FILE_NOEX} "
111
103
fi
112
- elif [ " ${RABBITMQ_CONFIG_FILE_NOEX} .conf" == " ${RABBITMQ_CONFIG_FILE} " ]; then
104
+ elif [ " ${RABBITMQ_CONFIG_FILE_NOEX} .conf" = " ${RABBITMQ_CONFIG_FILE} " ]; then
113
105
RABBITMQ_CONFIG_ARG=" -conf ${RABBITMQ_CONFIG_FILE_NOEX} \
114
106
-conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
115
107
-conf_script_dir ` dirname $0 ` \
You can’t perform that action at this time.
0 commit comments