Merge branch 'develop-v4' into release/v4

Author: mbtamuli

README.md

@@ -1,36 +1,22 @@
 # EasyEngine v4
 
+[![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=release%2Fv4)](https://travis-ci.org/EasyEngine/easyengine)
 ## Requirements
 
 * Docker
-* Docker-Compose
-* PHP
 
 ## Installing
 
-Once you've verified requirements, download the [easyengine.phar](https://raw.githubusercontent.com/easyengine/easyengine-builds/master/easyengine.phar) file using `wget` or `curl`:
+Once you've verified requirements, download the [setup.sh](http://rt.cx/eev4) file using `wget` or `curl` and execute it:
 
 ```bash
-curl -O https://raw.githubusercontent.com/easyengine/easyengine-builds/master/easyengine.phar
+wget rt.cx/eev4 -O ee4-setup && bash ee4-setup
 ```
 
-Next, check the Phar file to verify that it's working:
+If EE was installed successfully, you should see something like this when you run `ee cli version`:
 
 ```bash
-php easyengine.phar cli info
-```
-
-To use EEv4 from the command line by typing `ee4`, make the file executable and move it to somewhere in your PATH. For example:
-
-```bash
-chmod +x easyengine.phar
-sudo mv easyengine.phar /usr/local/bin/ee4
-```
-
-If EE was installed successfully, you should see something like this when you run `ee4 cli version`:
-
-```bash
-$ ee4 cli version
+$ ee cli version
 EE 0.0.1
 ```
 
@@ -41,14 +27,14 @@ EE 0.0.1
 Creates, lists and deletes WordPress websites.
 
 ~~~
-ee4 site
+ee site
 ~~~
 
 
 **EXAMPLES**
 
     # Create simple WordPress website. No parameter flag defaults to --wp
-    $ ee4 site create site.test
+    $ ee site create site.test
     Success: ee4_nginx-proxy container launched successfully.
     Configuring project...
     Creating WordPress site site.test...
@@ -72,7 +58,7 @@ ee4 site
     E-Mail :	[email protected]
     Site entry created.
 
-    $ ee4 site create site2.test --wpredis --user=admin --pass=admin [email protected] --title="Site by EasyEngine"
+    $ ee site create site2.test --wpredis --user=admin --pass=admin [email protected] --title="Site by EasyEngine"
     Configuring project...
     Creating WordPress site site2.test...
     Copying configuration files...
@@ -96,13 +82,13 @@ ee4 site
     E-Mail :	[email protected]
     Site entry created.
 
-    $ ee4 site list
+    $ ee site list
     List of Sites:
 
       - site.test
       - site2.test
 
-    $ ee4 site delete site.test
+    $ ee site delete site.test
     [site.test] Docker Containers removed.
     [site.test] Disconnected from Docker network nginx-proxy
     [site.test] Docker network nginx-proxy removed.
@@ -111,10 +97,10 @@ ee4 site
     Removing database entry.
     Site site.test deleted.
 
-### ee4 site create
+### ee site create
 
 ~~~
-ee4 site create <site-name> [--wp|--wpredis] [--letsencrypt] [--title=<title>] [--user=<username>] [--pass=<password>] [--email=<email>]
+ee site create <site-name> [--wp|--wpredis] [--letsencrypt] [--title=<title>] [--user=<username>] [--pass=<password>] [--email=<email>]
 ~~~
 
 Creates WordPress site. 
@@ -142,45 +128,45 @@ Creates WordPress site.
 	[--email=<email>]
 	    E-Mail of the WordPress administrator.
 
-### ee4 site list
+### ee site list
 
 ~~~
-ee4 site list
+ee site list
 ~~~
 
 Lists all the sites created by EasyEngine.
 
-### ee4 site delete
+### ee site delete
 
 ~~~
-ee4 site delete <site-name>
+ee site delete <site-name>
 ~~~
 
 Deletes the given site if it was created by EasyEngine.
 
-### ee4 wp
+### ee wp
 
 Run all the wp commands for site created by EasyEngine.
 
 ~~~
-ee4 wp
+ee wp
 ~~~
 
 ### Usage
 
 ~~~
-ee4 wp <site-name> <wp-command>
+ee wp <site-name> <wp-command>
 ~~~
 
 **EXAMPLES**
 
-    $ ee4 wp site.test plugin list
+    $ ee wp site.test plugin list
     +---------+----------+-----------+---------+
     | name    | status   | update    | version |
     +---------+----------+-----------+---------+
     | akismet | inactive | available | 4.0.2   |
     | hello   | inactive | none      | 1.6     |
     +---------+----------+-----------+---------+
 
-    $ ee4 wp site.test user create author1 [email protected] --user_pass=password --role=administrator
+    $ ee wp site.test user create author1 [email protected] --user_pass=password --role=administrator
     Success: Created user 2.