File tree Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -74,9 +74,19 @@ if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
74
74
cp " ${RABBITMQ_HOME} /priv/schema/rabbit.schema" " ${RABBITMQ_SCHEMA_DIR} "
75
75
fi
76
76
77
+ get_noex () {
78
+ if [ " x" = " x${1} " ]; then
79
+ echo " "
80
+ else
81
+ local BASENAME=$( basename $1 )
82
+ local DIRNAME=$( dirname $1 )
83
+ echo " ${DIRNAME} /${BASENAME% .* } "
84
+ fi
85
+ }
86
+
77
87
# Check that advanced config file has the .config extension
78
88
# Add .config extension if it's empty
79
- RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=" $ {RABBITMQ_ADVANCED_CONFIG_FILE% . * } "
89
+ RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=$( get_noex $ {RABBITMQ_ADVANCED_CONFIG_FILE} )
80
90
if [ " ${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX} .config" = " ${RABBITMQ_ADVANCED_CONFIG_FILE} " \
81
91
-o " ${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX} " = " ${RABBITMQ_ADVANCED_CONFIG_FILE} " ]; then
82
92
RABBITMQ_ADVANCED_CONFIG_FILE=" ${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX} .config"
87
97
fi
88
98
89
99
90
- RABBITMQ_CONFIG_FILE_NOEX=" $ {RABBITMQ_CONFIG_FILE% . * } "
100
+ RABBITMQ_CONFIG_FILE_NOEX=$( get_noex $ {RABBITMQ_CONFIG_FILE} )
91
101
92
102
# Extension is not specified.
93
103
# Determine config type from file
133
143
134
144
# Set -config if the file exists
135
145
if [ -f " ${RABBITMQ_CONFIG_ARG_FILE} " ]; then
136
- RABBITMQ_CONFIG_ARG_FILE_NOEX=" $ {RABBITMQ_CONFIG_ARG_FILE% . * } "
146
+ RABBITMQ_CONFIG_ARG_FILE_NOEX=$( get_noex $ {RABBITMQ_CONFIG_ARG_FILE} )
137
147
RABBITMQ_CONFIG_ARG=" -config ${RABBITMQ_CONFIG_ARG_FILE_NOEX} "
138
148
fi
139
149
You can’t perform that action at this time.
0 commit comments