Merge branch '1.6.0' of http://10.73.97.24/oecloud.io/oe-cloud-cli

lib/routes/home.js

@@ -99,7 +99,7 @@ module.exports = app => {
         type: ['attach','business-rules']
       }
     }, {
-      name: 'Get me out of here!',
+      name: 'Exit!',
       value: 'exit'
     }];
 

lib/routes/loopback.js

@@ -33,7 +33,7 @@ module.exports = (app, name) => {
       return;
     }
 
-    console.log(chalk.yellow('\nMake sure you are in the directory you want to scaffold into.'));
+    console.log(chalk.yellow('\nMake sure you are in the scaffolded project directory'));
 
     var mainCmds = process.argv.slice(0, 2);
     var lbCmd = "loopback:" + name[1];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oe-cloud-cli",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "CLI tool for installing and running oe packages",
   "license": "BSD-2-Clause",
   "main": "lib",
@@ -47,11 +47,11 @@
     "figures": "2.0.0",
     "fs-extra": "5.0.0",
     "fullname": "4.0.1",
-    "generator-loopback": "6.1.1",
+    "generator-loopback": "6.3.0",
     "humanize-string": "1.0.2",
     "inquirer": "6.5.2",
     "insight": "0.10.3",
-    "lodash": "4.17.15",
+    "lodash": "4.17.20",
     "log-update": "2.3.0",
     "meow": "3.7.0",
     "nopt": "3.0.6",
@@ -75,7 +75,7 @@
     "gulp-istanbul": "1.1.3",
     "gulp-mocha": "7.0.2",
     "gulp-plumber": "1.2.1",
-    "mocha": "7.0.0",
+    "mocha": "7.2.0",
     "mockery": "2.1.0",
     "nock": "9.6.1",
     "proxyquire": "1.8.0",

readme.md

@@ -49,10 +49,19 @@ $ oe
 3. Select what kind of application you want to create
 
     3.1 If selecting **oe-cloud-2.x** (default selection)
-
-       ![create-oe-cloud-2x](./img/create-oe-cloud-2x.png)
+
+       ![create-oe-cloud-2x](./img/create-oe-cloud-2.x.png)
+
+       3.1.1 If selecting **oe-cloud-2.x-server**
+            ![create-oe-cloud-2xserver](./img/create-oe-cloud-2xserver.png)
+
+       3.1.2 If selecting **oe-cloud-2.x-serverUI**
+            ![create-oe-cloud-2xserverUI](./img/create-oe-cloud-2xserverUI.png)
+
+       3.1.3 If selecting **oe-cloud-2.x-serverUI** and **Enable oe-studio**
+            ![create-oe-cloud-2xstudio](./img/create-oe-cloud-2xstudio.png)
 
-     *Press Enter to accept default value of Application Description, Version and Author. For oe-cloud 2.0 application, select oe-cloud modules from the checklist using Space Bar Button*.
+     *Press Enter to accept default value of Application Description, Version and Author. For oe-cloud 2.0 application, select oe-cloud modules from the checklist using Space Bar Button. Hit Enter to complete module selection*.
 
     3.2 If selecting **oe-cloud-1.x**