diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-31 11:08:26 +0100 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-05 21:32:12 +0300 |
| commit | 6a5f0266071ad5a47f51bad8da5b0f498ea9a65f (patch) | |
| tree | 03882b6208954a22f7ef39b7f266f5343ad97629 | |
| parent | 06fa298aacb9826a68224c123abb24c2cdabad22 (diff) | |
| download | rabbitmq-server-git-6a5f0266071ad5a47f51bad8da5b0f498ea9a65f.tar.gz | |
Equality operators and trimming extension
| -rwxr-xr-x | scripts/rabbitmq-server | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 62fb7b05fd..465ee1a53e 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -95,21 +95,13 @@ fi set -e -strip_trailing_config_or_conf() { - local dir=$(dirname $1) - local filename_without_conf=$(basename $1 .conf) - local filename_without_config=$(basename $filename_without_conf .config) +RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}" - echo "$dir/$filename_without_config" -} - -RABBITMQ_CONFIG_FILE_NOEX=$(strip_trailing_config_or_conf $RABBITMQ_CONFIG_FILE) - -if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" == "${RABBITMQ_CONFIG_FILE}" ]; then +if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then if [ -f "${RABBITMQ_CONFIG_FILE}" ]; then RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}" fi -elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" == "${RABBITMQ_CONFIG_FILE}" ]; then +elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \ -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ |