From 5abf8d451b0066230048f2f6a4fd7ecdbfee4cdf Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Tue, 21 Oct 2014 17:16:12 +0530 Subject: [PATCH] Kick out for invalid cache options --- src/modules/site/ee_mod_site_option.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/site/ee_mod_site_option.sh b/src/modules/site/ee_mod_site_option.sh index bc1ba4ee..bf096ba6 100644 --- a/src/modules/site/ee_mod_site_option.sh +++ b/src/modules/site/ee_mod_site_option.sh @@ -12,11 +12,6 @@ function ee_mod_site_option() fi fi - # Kick out for invalid cache option - if [ "$EE_SITE_CACHE_OPTION" != "--basic" ] || [ "$EE_SITE_CACHE_OPTION" != "--wpsc" ] || [ "$EE_SITE_CACHE_OPTION" != "--w3tc" ] || [ "$EE_SITE_CACHE_OPTION" != "--wpfc" ]; then - ee_lib_error "Invalid cache option $EE_SITE_CACHE_OPTION, exit status = " $? - fi - # WordPresss subdirectory variables if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdirectory" ]; then EE_SITE_CREATE_OPTION="--wpsubdir" @@ -39,4 +34,9 @@ function ee_mod_site_option() if [ "$EE_SITE_CACHE_OPTION" = "" ] && [ "$EE_SITE_CREATE_OPTION" != "--html" ] && [ "$EE_SITE_CREATE_OPTION" != "--php" ] && [ "$EE_SITE_CREATE_OPTION" != "--mysql" ]; then EE_SITE_CACHE_OPTION=--basic fi + + # Kick out for invalid cache option + if [[ "$EE_SITE_CACHE_OPTION" != "--basic" || "$EE_SITE_CACHE_OPTION" != "--wpsc" || "$EE_SITE_CACHE_OPTION" != "--w3tc" || "$EE_SITE_CACHE_OPTION" != "--wpfc" ]] && [[ "$EE_SITE_CREATE_OPTION" != "--html" || "$EE_SITE_CREATE_OPTION" != "--php" || "$EE_SITE_CREATE_OPTION" != "--mysql" ]]; then + ee_lib_error "Invalid cache option $EE_SITE_CACHE_OPTION, exit status = " $? + fi }