fix(main): fix can not catch error bug

isuke · Nov 13, 2018 · 2b93432 · 2b93432
1 parent c2a3991
commit 2b93432
Showing 1 changed file with 31 additions and 33 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -72,37 +72,35 @@ const customHelp = (program, templateFilePath, definitionsFilePath) => {
 //
 // Main
 //
-try {
-  program
-    .option('-d, --duet', 'run git-duet mode')
-    .option('-D, --dry-run', 'run dry-run mode')
-    .option('-i, --interactive', 'run interactive mode')
-    .option('-S, --silent', "don't show commit command")
-    .option('-t, --typo-check', '[Already deleted this function] check spell')
-    .option('--gen-config', 'generate config files')
-    .version(version)
-
-  if (process.argv.includes('--gen-config')) {
-    program.parse(process.argv)
-    genConfig(program, templateFileName, definitionsFileName)
-  } else {
-    const projectRoot = getProjectRoot()
-    const rootPath = projectRoot === '' ? process.env.HOME : projectRoot
-
-    const templateFilePath = getFilePath(rootPath, templateFileName)
-    const definitionsFilePath = getFilePath(rootPath, definitionsFileName)
-
-    const template = fs.readFileSync(templateFilePath, 'utf8')
-    const definitions = loadDefinitions(definitionsFilePath)
-    const terms = _.keys(definitions)
-
-    customHelp(program, templateFilePath, definitionsFilePath)
-
-    setOptions(program, definitions, terms).parse(process.argv)
-
-    main(program, template, definitions, terms)
-  }
-} catch (e) {
-  console.error(`${colors.error}${e.message}${colors.reset}`)
-  e.status ? process.exit(e.status) : process.exit(1)
+program
+  .option('-d, --duet', 'run git-duet mode')
+  .option('-D, --dry-run', 'run dry-run mode')
+  .option('-i, --interactive', 'run interactive mode')
+  .option('-S, --silent', "don't show commit command")
+  .option('-t, --typo-check', '[Already deleted this function] check spell')
+  .option('--gen-config', 'generate config files')
+  .version(version)
+
+if (process.argv.includes('--gen-config')) {
+  program.parse(process.argv)
+  genConfig(program, templateFileName, definitionsFileName)
+} else {
+  const projectRoot = getProjectRoot()
+  const rootPath = projectRoot === '' ? process.env.HOME : projectRoot
+
+  const templateFilePath = getFilePath(rootPath, templateFileName)
+  const definitionsFilePath = getFilePath(rootPath, definitionsFileName)
+
+  const template = fs.readFileSync(templateFilePath, 'utf8')
+  const definitions = loadDefinitions(definitionsFilePath)
+  const terms = _.keys(definitions)
+
+  customHelp(program, templateFilePath, definitionsFilePath)
+
+  setOptions(program, definitions, terms).parse(process.argv)
+
+  main(program, template, definitions, terms).catch((e) => {
+    console.error(`${colors.error}${e.message}${colors.reset}`)
+    e.status ? process.exit(e.status) : process.exit(1)
+  })
 }