From e3a5b63c57b9571445954b1d90cf5ed46cfd13ac Mon Sep 17 00:00:00 2001
From: liuweigl <wei2460@qq.com>
Date: Thu, 16 Feb 2023 21:37:31 +0800
Subject: [PATCH] fix: not working if the mkcert in directory with special
 charaters

close #61
---
 plugin/mkcert/index.ts | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugin/mkcert/index.ts b/plugin/mkcert/index.ts
index 89db69a..4579f8e 100644
--- a/plugin/mkcert/index.ts
+++ b/plugin/mkcert/index.ts
@@ -130,20 +130,23 @@ class Mkcert {
   }
 
   private async getMkcertBinnary() {
+    let binnary
+
     if (this.localMkcert) {
       if (await exists(this.localMkcert)) {
-        return this.localMkcert
-      }
-      this.logger.error(
-        pc.red(
-          `${this.localMkcert} does not exist, please check the mkcertPath parameter`
+        binnary = this.localMkcert
+      } else {
+        this.logger.error(
+          pc.red(
+            `${this.localMkcert} does not exist, please check the mkcertPath parameter`
+          )
         )
-      )
-      return undefined
+      }
     } else if (await exists(this.savedMkcert)) {
-      return this.savedMkcert
+      binnary = this.savedMkcert
     }
-    return undefined
+
+    return escape(binnary)
   }
 
   private async checkCAExists() {
@@ -157,7 +160,11 @@ class Mkcert {
     }
 
     const mkcertBinnary = await this.getMkcertBinnary()
-    const commandResult = await exec(`${mkcertBinnary} -CAROOT`)
+    const commandStatement = `${mkcertBinnary} -CAROOT`
+
+    debug(`Exec ${commandStatement}`)
+
+    const commandResult = await exec(commandStatement)
     const caDirPath = path.resolve(
       commandResult.stdout.toString().replaceAll('\n', '')
     )
@@ -187,7 +194,6 @@ class Mkcert {
 
   private async createCertificate(hosts: string[]) {
     const names = hosts.join(' ')
-
     const mkcertBinnary = await this.getMkcertBinnary()
 
     if (!mkcertBinnary) {
@@ -199,7 +205,7 @@ class Mkcert {
     await ensureDirExist(this.savePath)
     await this.retainExistedCA()
 
-    const cmd = `${escape(mkcertBinnary)} -install -key-file ${escape(
+    const cmd = `${mkcertBinnary} -install -key-file ${escape(
       this.keyFilePath
     )} -cert-file ${escape(this.certFilePath)} ${names}`