fix(cli): fix double output, fix #1291

koishijs · Dec 11, 2023 · d88c8db · d88c8db
1 parent 7f1f0e9
commit d88c8db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packages/koishi/src/cli/index.ts b/packages/koishi/src/cli/index.ts
@@ -6,8 +6,8 @@ const cli = CAC('koishi').help().version(version)
 
 registerStartCommand(cli)
 
-cli.parse()
+const argv = cli.parse()
 
-if (!cli.matchedCommand) {
+if (!cli.matchedCommand && !argv.options.help) {
   cli.outputHelp()
 }
diff --git a/packages/koishi/src/cli/start.ts b/packages/koishi/src/cli/start.ts
@@ -109,14 +109,12 @@ export default function (cli: CAC) {
     .option('--debug [namespace]', 'specify debug namespace')
     .option('--log-level [level]', 'specify log level (default: 2)')
     .option('--log-time [format]', 'show timestamp in logs')
-    .option('--watch [path]', 'watch and reload at change')
     .action((file, options) => {
-      const { logLevel, debug, logTime, watch, ...rest } = options
+      const { logLevel, debug, logTime, ...rest } = options
       if (logLevel !== undefined && (!isInteger(logLevel) || logLevel < 0)) {
         console.warn(`${kleur.red('error')} log level should be a positive integer.`)
         process.exit(1)
       }
-      setEnvArg('KOISHI_WATCH_ROOT', watch) // for backward compatibility
       setEnvArg('KOISHI_LOG_TIME', logTime)
       process.env.KOISHI_LOG_LEVEL = logLevel || ''
       process.env.KOISHI_DEBUG = debug || ''