From 6d8aaa46d7144d16fec5cec5005373e8c7501563 Mon Sep 17 00:00:00 2001
From: Mitesh Shah <Mitesh.Shah@rtcamp.com>
Date: Fri, 14 Jun 2013 18:03:51 +0530
Subject: [PATCH] Fix EE File Structure

---
 etc/{ => bash_completion.d}/ee                           | 0
 etc/easyengine/ee.conf                                   | 5 +++++
 etc/ee.conf                                              | 0
 install.sh                                               | 6 +++---
 usr/local/sbin/easyengine                                | 9 +++++++++
 .../{ => easyengine}/nginx/multisite/subdir/basic.conf   | 0
 .../nginx/multisite/subdomain/basic.conf                 | 0
 usr/share/{ => easyengine}/nginx/singlesite/basic.conf   | 0
 .../{ => easyengine}/nginx/singlesite/fastcgi-cache.conf | 0
 .../nginx/singlesite/w3-total-cache.conf                 | 0
 .../nginx/singlesite/wp-super-cache.conf                 | 0
 11 files changed, 17 insertions(+), 3 deletions(-)
 rename etc/{ => bash_completion.d}/ee (100%)
 create mode 100644 etc/easyengine/ee.conf
 delete mode 100644 etc/ee.conf
 rename usr/share/{ => easyengine}/nginx/multisite/subdir/basic.conf (100%)
 rename usr/share/{ => easyengine}/nginx/multisite/subdomain/basic.conf (100%)
 rename usr/share/{ => easyengine}/nginx/singlesite/basic.conf (100%)
 rename usr/share/{ => easyengine}/nginx/singlesite/fastcgi-cache.conf (100%)
 rename usr/share/{ => easyengine}/nginx/singlesite/w3-total-cache.conf (100%)
 rename usr/share/{ => easyengine}/nginx/singlesite/wp-super-cache.conf (100%)

diff --git a/etc/ee b/etc/bash_completion.d/ee
similarity index 100%
rename from etc/ee
rename to etc/bash_completion.d/ee
diff --git a/etc/easyengine/ee.conf b/etc/easyengine/ee.conf
new file mode 100644
index 00000000..1436f454
--- /dev/null
+++ b/etc/easyengine/ee.conf
@@ -0,0 +1,5 @@
+# The Easy Engine Configuration File
+
+
+
+apt-get=yes
\ No newline at end of file
diff --git a/etc/ee.conf b/etc/ee.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/install.sh b/install.sh
index 188d4785..a9b2666d 100644
--- a/install.sh
+++ b/install.sh
@@ -121,12 +121,12 @@ fi
 echo -e "\033[34m Installing Easy Engine, Please Wait...  \e[0m" | tee -ai $INSTALLLOG
 
 # EE /etc Files
-cp -a /tmp/easyengine/etc/ee /etc/bash_completion.d/ &>> /dev/null || OwnError "Unable To Copy EE Auto Complete File"
-cp -a /tmp/easyengine/etc/ee.conf /etc/easyengine/ &>> /dev/null || OwnError "Unable To Copy ee.conf File"
+cp -a /tmp/easyengine/etc/bash_completion.d/ee /etc/bash_completion.d/ &>> /dev/null || OwnError "Unable To Copy EE Auto Complete File"
+cp -a /tmp/easyengine/etc/easyengine/ee.conf /etc/easyengine/ &>> /dev/null || OwnError "Unable To Copy ee.conf File"
 
 # EE /usr/share/easyengine Files
 cp -a /tmp/easyengine/etc/nginx/ /usr/share/easyengine/nginx/ &>> /dev/null || OwnError "Unable To Copy Configuration Files "
-cp -a /tmp/easyengine/usr/share/* /usr/share/easyengine/ &>> /dev/null || OwnError "Unable To Copy Configuration Files "
+cp -a /tmp/easyengine/usr/share/easyengine/* /usr/share/easyengine/ &>> /dev/null || OwnError "Unable To Copy Configuration Files "
 
 # EE Command
 cp -a /tmp/easyengine/usr/local/sbin/easyengine /usr/local/sbin/ &>> /dev/null || OwnError "Unable To Copy EasyEngine Command"
diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index 51e6e09d..910dfd31 100755
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -36,6 +36,15 @@ EngineHelp()
 LOGDIR=/var/log/easyengine
 ERRORLOG=/var/log/easyengine/error.log
 
+# Check Auto Yes To Apt-Get
+grep apt-get /etc/easyengine/ee.conf | grep -i yes
+if [ $? -eq 0]
+then
+	EEAPTGET="apt-get -y"
+else
+	EEAPTGET="apt-get"
+fi
+
 
 # Capture Errors
 OwnError()
diff --git a/usr/share/nginx/multisite/subdir/basic.conf b/usr/share/easyengine/nginx/multisite/subdir/basic.conf
similarity index 100%
rename from usr/share/nginx/multisite/subdir/basic.conf
rename to usr/share/easyengine/nginx/multisite/subdir/basic.conf
diff --git a/usr/share/nginx/multisite/subdomain/basic.conf b/usr/share/easyengine/nginx/multisite/subdomain/basic.conf
similarity index 100%
rename from usr/share/nginx/multisite/subdomain/basic.conf
rename to usr/share/easyengine/nginx/multisite/subdomain/basic.conf
diff --git a/usr/share/nginx/singlesite/basic.conf b/usr/share/easyengine/nginx/singlesite/basic.conf
similarity index 100%
rename from usr/share/nginx/singlesite/basic.conf
rename to usr/share/easyengine/nginx/singlesite/basic.conf
diff --git a/usr/share/nginx/singlesite/fastcgi-cache.conf b/usr/share/easyengine/nginx/singlesite/fastcgi-cache.conf
similarity index 100%
rename from usr/share/nginx/singlesite/fastcgi-cache.conf
rename to usr/share/easyengine/nginx/singlesite/fastcgi-cache.conf
diff --git a/usr/share/nginx/singlesite/w3-total-cache.conf b/usr/share/easyengine/nginx/singlesite/w3-total-cache.conf
similarity index 100%
rename from usr/share/nginx/singlesite/w3-total-cache.conf
rename to usr/share/easyengine/nginx/singlesite/w3-total-cache.conf
diff --git a/usr/share/nginx/singlesite/wp-super-cache.conf b/usr/share/easyengine/nginx/singlesite/wp-super-cache.conf
similarity index 100%
rename from usr/share/nginx/singlesite/wp-super-cache.conf
rename to usr/share/easyengine/nginx/singlesite/wp-super-cache.conf