From c282d486e67439a8192b01a85ce4ce2679c27e1e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Dec 2017 07:04:54 -0800 Subject: [PATCH] Adjust boolean comparison to allow "false", "no", and "0" to all become "false" --- 3.7/alpine/docker-entrypoint.sh | 5 ++++- 3.7/debian/docker-entrypoint.sh | 5 ++++- 3.7/docker-entrypoint.sh | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh index 876f73a..9b749d7 100755 --- a/3.7/alpine/docker-entrypoint.sh +++ b/3.7/alpine/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh index 4f060f6..bb5b3c3 100755 --- a/3.7/debian/docker-entrypoint.sh +++ b/3.7/debian/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh index 4f060f6..bb5b3c3 100755 --- a/3.7/docker-entrypoint.sh +++ b/3.7/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately