From 0b8cd232af6315bae5d51565dad47da8bcd04cff Mon Sep 17 00:00:00 2001 From: Jakob Nohe Date: Sun, 27 Dec 2020 19:47:00 +0100 Subject: [PATCH] Do not fallback to string if array can be parsed (#5420) * Do not fallback to string if array can be parsed This in needed, otherwise ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY can never be set to a JSON object (array). * Update settings.js Co-authored-by: Koen Kanters --- lib/util/settings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/util/settings.js b/lib/util/settings.js index f7308e48..276b8b8e 100644 --- a/lib/util/settings.js +++ b/lib/util/settings.js @@ -473,15 +473,15 @@ function applyEnvironmentVariables(settings) { if (type.indexOf('object') >= 0 || type.indexOf('array') >= 0) { setting[key] = JSON.parse(process.env[envVariableName]); - } - if (type.indexOf('number') >= 0) { + } else if (type.indexOf('number') >= 0) { setting[key] = process.env[envVariableName] * 1; - } - if (type.indexOf('boolean') >= 0) { + } else if (type.indexOf('boolean') >= 0) { setting[key] = process.env[envVariableName].toLowerCase() === 'true'; - } - if (type.indexOf('string') >= 0) { - setting[key] = process.env[envVariableName]; + } else { + /* istanbul ignore else */ + if (type.indexOf('string') >= 0) { + setting[key] = process.env[envVariableName]; + } } } }