Correct CLI path in ./bin/kibana. Copy yargs config node from `pack…

…age.json` during build.
elastic · Jul 31, 2018 · bd4fadc · bd4fadc
1 parent 6b4b7e6
commit bd4fadc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/bin/kibana b/bin/kibana
@@ -21,4 +21,5 @@ if [ ! -x "$NODE" ]; then
  exit 1
 fi
 
-NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/cli" ${@}
+
+NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/core/cli" ${@}
diff --git a/bin/kibana.bat b/bin/kibana.bat
@@ -15,7 +15,7 @@ If Not Exist "%NODE%" (
 )
 
 TITLE Kibana Server
-"%NODE%" %NODE_OPTIONS% --no-warnings "%DIR%\src\cli" %*
+"%NODE%" %NODE_OPTIONS% --no-warnings "%DIR%\src\core\cli" %*
 
 :finally
 

diff --git a/src/core/cli/cli.ts b/src/core/cli/cli.ts
@@ -38,7 +38,7 @@ Specify --help for available options
 
 export const parseArgv = (argv: string[]): Arguments => {
  return yargs(argv)
- .usage(args.usage + '\n\n' + args.description)
+ .usage(`${args.usage}\n\n${args.description}`)
  .scriptName('')
  .version()
  .alias('h', 'help')
@@ -55,7 +55,7 @@ export const run = () => {
  const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv;
 
  const cliArgs = parseArgv(argv.slice(2));
- if (cliArgs._[0]) {
+ if (cliArgs._.length > 0) {
  onCliError(`unknown command ${cliArgs._[0]}`);
  }
 };

diff --git a/src/dev/build/tasks/create_package_json_task.js b/src/dev/build/tasks/create_package_json_task.js
@@ -43,6 +43,7 @@ export const CreatePackageJsonTask = {
  node: pkg.engines.node,
  },
  dependencies: transformDependencies(pkg.dependencies),
+ yargs: pkg.yargs,
  };
 
  if (build.isOss()) {