Merge remote-tracking branch 'origin/dev' into dev

app/electron/main.js

@@ -53,10 +53,8 @@ try {
   }
 } catch (e) {
   console.error(e)
-  require('electron').
-    dialog.
-    showErrorBox('创建配置目录失败 Failed to create config directory',
-      '思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
+  require('electron').dialog.showErrorBox('创建配置目录失败 Failed to create config directory',
+    '思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
   app.exit()
 }
 
@@ -416,6 +414,8 @@ const initKernel = (workspace, lang) => {
     }
     if (workspace) {
       cmds.push('--workspace', workspace)
+    }
+    if (lang) {
       cmds.push('--lang', lang)
     }
     let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join(
@@ -826,7 +826,19 @@ app.whenReady().then(() => {
       firstOpenWindow.destroy()
     })
   } else {
-    initKernel().then((isSucc) => {
+    const getArg = (name) => {
+      for (let i = 0; i < process.argv.length; i++) {
+        if (process.argv[i] === name) {
+          return process.argv[i + 1]
+        }
+      }
+    }
+
+    const workspace = getArg("--workspace")
+    if (workspace) {
+      writeLog("got arg [--workspace=" + workspace + "]")
+    }
+    initKernel(workspace).then((isSucc) => {
       if (isSucc) {
         boot()
       }