From 42092d788503cf0ad7d05a1b64da86ba9c72657e Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Thu, 7 Mar 2019 12:36:32 +0100
Subject: [PATCH] remove --experimental

---
 install                | 9 ++++-----
 wo/cli/plugins/site.py | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/install b/install
index 4131b1e..684ab65 100644
--- a/install
+++ b/install
@@ -27,7 +27,7 @@ TPUT_FAIL=$(tput setaf 1)
 
 wo_lib_echo () {
     TPUT_ECHO=$(tput setaf 4)
-    echo "${TPUT_ECHO}${*}${TPUT_RESET}"
+    echo "${*}${TPUT_RESET}"
 }
 
 wo_lib_echo_info()
@@ -123,17 +123,17 @@ fi
 ####
 wo_install_dep()
 {
-    echo -ne '       Installing dependencies               [..]\r'
+    echo -ne "${TPUT_ECHO}Installing dependencies               ${TPUT_RESET}[..]\r"
     if {
         if [ "$wo_linux_distro" == "Ubuntu" ]; then
             apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1
         else
             apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1
         fi
-        }; then echo -ne '       Installing dependencies                [OK]\r'
+        }; then echo -ne "${TPUT_ECHO}Installing dependencies                ${TPUT_RESET}[OK]\r"
         echo -ne '\n'
     else
-        echo -e "        Installing dependencies              [FAIL]"
+        echo -e "${TPUT_FAIL}Installing dependencies              ${TPUT_RESET}[FAIL]"
         echo -ne '\n'
     fi
     locale-gen en &>> /dev/null
@@ -695,7 +695,6 @@ else
         fi
     else
         # 3 - Fresh WO setup
-        wo_lib_echo "Installing depedencies" | tee -ai $wo_install_log
         wo_install_dep | tee -ai $wo_install_log
         wo_lib_echo "Installing WordOps $wo_branch" | tee -ai $wo_install_log
         wo_install | tee -ai $wo_install_log
diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py
index 417342d..69fcc1b 100644
--- a/wo/cli/plugins/site.py
+++ b/wo/cli/plugins/site.py
@@ -1180,7 +1180,7 @@ class WOSiteUpdateController(CementBaseController):
 
         if pargs.hhvm == "on" or pargs.letsencrypt == "on" or pargs.php73 == "on":
             if pargs.php73 == "on":
-                if (not pargs.experimental):
+                if pargs.experimental:
                     Log.info(
                         self, "Do you wish to enable PHP 7.3 now for {0}?".format(wo_domain))
 
@@ -1197,7 +1197,7 @@ class WOSiteUpdateController(CementBaseController):
                     php73 = True
 
             if pargs.hhvm == "on":
-                if (not pargs.experimental):
+                if pargs.experimental:
                     Log.info(self, "HHVM is experimental feature and it may not"
                              " work with all plugins of your site.\nYou can "
                              "disable it by passing --hhvm=off later.\nDo you wish"
@@ -1218,7 +1218,7 @@ class WOSiteUpdateController(CementBaseController):
 
             if pargs.letsencrypt == "on":
 
-                if (not pargs.experimental):
+                if pargs.experimental:
 
                     if oldsitetype in ['wpsubdomain']:
                         Log.warn(
@@ -1241,7 +1241,7 @@ class WOSiteUpdateController(CementBaseController):
                     letsencrypt = True
 
         if pargs.wpredis and data['currcachetype'] != 'wpredis':
-            if (not pargs.experimental):
+            if pargs.experimental:
                 Log.info(self, "Redis is experimental feature and it may not"
                          " work with all plugins of your site.\nYou can "
                          "disable it by changing cache type later.\nDo you wish"