Merge branch '2.2' into develop

2018-05-04 10:18:48 +03:00
parent eba6c0c596 2bb6c84be0
commit 4a0df97e02
3 changed files with 8 additions and 11 deletions
--- a/maxctrl/lib/core.js
+++ b/maxctrl/lib/core.js
@ -105,7 +105,8 @@ program
    .demandCommand(1, 'At least one command is required')
    .command('*', 'the default command', {}, function(argv) {
        maxctrl(argv, function() {
-            return error('Unknown command ' + JSON.stringify(argv._) + '. See output of `help` for a list of commands.')
+            msg = argv._.length == 0 ? 'No command given' : 'Unknown command ' + JSON.stringify(argv._)
+            return error(msg + '. See output of `help` for a list of commands.')
        })
    })