From 07d13143ad2c060423e8b66389795a7d2113aa5b Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 9 Mar 2016 10:29:53 +0100 Subject: [PATCH] Fixed the empty var problem --- entrypoint.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index f1afe8c..f41618e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -291,19 +291,19 @@ zulipConfiguration() { for setting_key in "${given_settings[@]}"; do local key="SETTING_$setting_key" local setting_var="${!key}" - if [ -z "$SETTING_VAR" ]; then + if [ -z "$setting_var" ]; then echo "Empty var for key \"$setting_key\"." continue fi # Zulip settings.py / zproject specific overrides here if [ "$setting_key" = "ADMIN_DOMAIN" ]; then - FILE="$SETTINGS_PY" - elif [ "$setting_key" = "MEMCACHED_LOCATION" ]; then + local FILE="$SETTINGS_PY" + elif [ "$setting_key" = "MEMCACHED_LOCATION" ]; then FILE="$ZPROJECT_SETTINGS" elif [[ "$setting_key" = "REDIS_"* ]]; then - FILE="$ZPROJECT_SETTINGS" - elif [[ "$setting_key" = "RABBITMQ_"* ]]; then - FILE="$ZPROJECT_SETTINGS" + FILE="$ZPROJECT_SETTINGS" + elif [[ "$setting_key" = "RABBITMQ_"* ]]; then + FILE="$ZPROJECT_SETTINGS" fi setConfigurationValue "$setting_key" "$setting_var" "$FILE" done