From b6eacac49aa2badd12b8bac497631a972e8b1d16 Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Mon, 4 Mar 2019 13:57:59 +0100
Subject: [PATCH] install wp-cli during initial setup

---
 install | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/install b/install
index 6583c31..29447cc 100644
--- a/install
+++ b/install
@@ -678,17 +678,15 @@ wo_git_init()
     }> /dev/null
 }
 
-if [ ! -x /usr/local/bin/ee ]; then
-    if [ ! -x /usr/local/bin/wo ]; then
-        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
-        wo_lib_echo "Running post-install steps" | tee -ai $wo_install_log
-        secure_wo_db | tee -ai $EE_INSTALL_LOG
-        wo_git_init | tee -ai $wo_install_log
-        wo_update_wp_cli | tee -ai $wo_install_log
-    fi
+if [ ! -f /usr/local/bin/wo ]; then
+    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
+    wo_lib_echo "Running post-install steps" | tee -ai $wo_install_log
+    secure_wo_db | tee -ai $EE_INSTALL_LOG
+    wo_git_init | tee -ai $wo_install_log
+    wo_update_wp_cli | tee -ai $wo_install_log
 else
     wo -v 2>&1 | grep $wo_version_new &>> /dev/null
     if [[ $? -ne 0 ]];then