From 3255d0b12fdf94213a6049e0727f66aa71183f64 Mon Sep 17 00:00:00 2001
From: Rahul Bansal <rahul.bansal@rtcamp.com>
Date: Fri, 14 Feb 2014 01:34:33 +0530
Subject: [PATCH] fixes #120 and #121

---
 CHANGELOG.txt             |  5 +++++
 usr/local/sbin/easyengine | 16 +++++++---------
 usr/local/sbin/eeupdate   |  1 -
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 34100a69..bd16d11a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+v 1.1.4
+  - Fixed wp-cli issue with --allow-root error. 
+  - Started using own wp-cli mirror to avoid future issues.
+  
+
 v 1.1.3
   - Added GPL License. Ref - https://rtcamp.com/easyengine-is-gpl/
 
diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index bb39d14d..eac4e516 100644
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-
-
 # Make Variables Available For Later Use
 LOGDIR=/var/log/easyengine
 ERRORLOG=/var/log/easyengine/error.log
@@ -977,7 +975,7 @@ EEWPDBSETUP()
 	# Create WordPress Tables
 	echo -e "\033[34mSetting Up WordPress, Please Wait...\e[0m"
 	cd /var/www/$DOMAIN/htdocs || OwnError "Unable To Change Directory To Install WordPress"
-	wp core install --url=$WWWDOMAIN --title="$WWWDOMAIN" \
+	wp core install --allow-root  --url=$WWWDOMAIN --title="$WWWDOMAIN" \
 	--admin_name=$WPADMINUSER --admin_password=$WPADMINPASS --admin_email=$WPADMINEMAIL &>> $INSTALLLOG \
 	|| OwnError "Unable To Create WordPress Tables For $DOMAIN"
 }
@@ -1055,10 +1053,10 @@ TOTALCACHENGINX()
 	# Installing W3 Total Cache
 	cd /var/www/$DOMAIN/htdocs/
 	echo -e "\033[34mInstalling W3 Total Cache Plugin, Please Wait...\e[0m"
-	wp plugin install w3-total-cache &>> $INSTALLLOG || OwnError "Unable To Install W3 Total Cache Plugin"
+	wp plugin --allow-root install w3-total-cache &>> $INSTALLLOG || OwnError "Unable To Install W3 Total Cache Plugin"
 
 	# Activate W3 Total Cache
-	wp plugin activate w3-total-cache $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate W3 Total Cache Plugin"
+	wp plugin --allow-root activate w3-total-cache $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate W3 Total Cache Plugin"
 
 	# Install Opcache & Memcache
 	EEOPMEMCACHE
@@ -1069,10 +1067,10 @@ SUPERCACHENGINX()
 	# Installing WP Super Cache
 	cd /var/www/$DOMAIN/htdocs/
 	echo -e "\033[34mInstalling WP Super Cache Plugin, Please Wait...\e[0m"
-	wp plugin install wp-super-cache &>> $INSTALLLOG || OwnError "Unable To Install WP Super Cache Plugin"
+	wp plugin --allow-root install wp-super-cache &>> $INSTALLLOG || OwnError "Unable To Install WP Super Cache Plugin"
 
 	# Activate WP Super Cache
-	wp plugin activate wp-super-cache $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate WP Super Cache Plugin"
+	wp plugin --allow-root activate wp-super-cache $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate WP Super Cache Plugin"
 }
 
 NGINXHELPER()
@@ -1080,10 +1078,10 @@ NGINXHELPER()
 	# Installing Nginx Helper
 	cd /var/www/$DOMAIN/htdocs/
 	echo -e "\033[34mInstalling Nginx Helper Plugin, Please Wait...\e[0m"
-	wp plugin install nginx-helper &>> $INSTALLLOG || OwnError "Unable To Install Nginx Helper"
+	wp plugin --allow-root install nginx-helper &>> $INSTALLLOG || OwnError "Unable To Install Nginx Helper"
 
 	# Activate Nginx Helper
-	wp plugin activate nginx-helper $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate Nginx Helper Plugin"
+	wp plugin --allow-root activate nginx-helper $NETWORKACTIVATE &>> $INSTALLLOG || OwnError "Unable To Activate Nginx Helper Plugin"
 }
 
 
diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate
index 5019ecf7..e58b1b92 100644
--- a/usr/local/sbin/eeupdate
+++ b/usr/local/sbin/eeupdate
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 
-
 # Make Variables Available For Later Use
 INSTALLLOG=/var/log/easyengine/install.log