Merge branch 'develop' for v4.0.3

Author: mrrobot47

VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

ci/deploy.sh

@@ -32,9 +32,9 @@ echo "|1|qPmmP7LVZ7Qbpk7AylmkfR0FApQ=|WUy1WS3F4qcr3R5Sc728778goPw= ssh-rsa AAAAB
 
 git clone [email protected]:easyengine/easyengine-builds.git
 
-git config user.name "Travis CI"
-git config user.email "[email protected]"
-git config push.default "current"
+git config --global user.name "rtBot"
+git config --global user.email "[email protected]"
+git config --global push.default "current"
 
 if [[ "$TRAVIS_BRANCH" == "develop" ]]; then
 	fname="phar/easyengine-nightly.phar"

ci/prepare.sh

@@ -7,7 +7,6 @@ if [[ "$TRAVIS_BRANCH" != $DEPLOY_BRANCH ]]; then
     version="$(echo $version | xargs)"
     version+="-nightly-$(git rev-parse --short HEAD)"
     echo $version > VERSION
-    sed -i 's/\:\ \"\(.*\)\"/\:\ \"\1-nightly\"/g' img-versions.json
 fi
 
 php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet

composer.json

@@ -29,13 +29,14 @@
         "composer/semver": "1.4.2",
         "easyengine/admin-tools-command": "v1.0.1",
         "easyengine/auth-command": "v1.0.0",
-        "easyengine/config-command": "v1.0.0",
+        "easyengine/config-command": "v1.0.1",
         "easyengine/cron-command": "v1.0.1",
+        "easyengine/log-command": "v1.0.0",
         "easyengine/mailhog-command": "v1.0.1",
-        "easyengine/site-command": "v2.2.3",
+        "easyengine/site-command": "v2.2.4",
         "easyengine/site-type-wp": "v1.0.1",
         "easyengine/site-type-php": "v1.0.1",
-        "easyengine/service-command": "v1.0.1",
+        "easyengine/service-command": "v1.0.2",
         "easyengine/shell-command" : "v1.0.0",
         "justinrainbow/json-schema": "5.2.7",
         "monolog/monolog": "1.24.0",

composer.lock

@@ -15,11 +15,11 @@ class Help_Command extends EE_Command {
 	 *
 	 * ## EXAMPLES
 	 *
-	 *     # get help for `core` command
-	 *     ee help core
+	 *     # get help for `site` command
+	 *     ee help site
 	 *
-	 *     # get help for `core download` subcommand
-	 *     ee help core download
+	 *     # get help for `site create` subcommand
+	 *     ee help site create
 	 */
 	public function __invoke( $args, $assoc_args ) {
 		$r = EE::get_runner()->find_command_to_run( $args );