From e66bc11b01e845a2f924be0e293a39abc6719594 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 19 Jul 2023 23:30:54 +0800 Subject: [PATCH] :art: Improve auto update https://ld246.com/article/1689772851501 --- kernel/model/conf.go | 2 +- kernel/model/updater.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 2f2c43f35..57115d566 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -517,7 +517,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) { util.PushMsg(Conf.Language(130), 1000*5) // 桌面端退出拉起更新安装时有时需要重启两次 https://github.com/siyuan-note/siyuan/issues/6544 // 这里多等待一段时间,等待安装程序启动 - time.Sleep(3 * time.Second) + time.Sleep(4 * time.Second) } logging.LogInfof("exited kernel") closeSyncWebSocket() diff --git a/kernel/model/updater.go b/kernel/model/updater.go index f8eaa6827..dcdeffd58 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -41,13 +41,13 @@ func execNewVerInstallPkg(newVerInstallPkgPath string) { logging.LogInfof("installing the new version [%s]", newVerInstallPkgPath) var cmd *exec.Cmd if gulu.OS.IsWindows() { - cmd = exec.Command("cmd.exe", "/C", "start", newVerInstallPkgPath) + cmd = exec.Command(newVerInstallPkgPath) } else if gulu.OS.IsDarwin() { exec.Command("chmod", "+x", newVerInstallPkgPath).CombinedOutput() cmd = exec.Command("open", newVerInstallPkgPath) } gulu.CmdAttr(cmd) - cmdErr := cmd.Start() + cmdErr := cmd.Run() if nil != cmdErr { logging.LogErrorf("exec install new version failed: %s", cmdErr) return