From 2ecdc7a2958d7057eb5487ae5b29aa3d78980a59 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 29 Dec 2024 11:11:54 +0800 Subject: [PATCH] :art: Support one-click addition of Microsoft Defender exclusions https://github.com/siyuan-note/siyuan/issues/13650 --- kernel/model/elevator_windows.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/model/elevator_windows.go b/kernel/model/elevator_windows.go index 41bb969f4..22e28658b 100644 --- a/kernel/model/elevator_windows.go +++ b/kernel/model/elevator_windows.go @@ -52,17 +52,17 @@ func AddMicrosoftDefenderExclusion() (err error) { installPath := filepath.Dir(util.WorkingDir) psArgs := []string{"-Command", "Add-MpPreference", "-ExclusionPath", installPath, ",", util.WorkspaceDir} if isAdmin() { - logging.LogInfof("current user is admin, add Windows Defender exclusion path [%s, %s]", installPath, util.WorkingDir) + logging.LogInfof("current user is admin, add Windows Defender exclusion path [%s, %s]", installPath, util.WorkspaceDir) cmd := exec.Command("powershell", psArgs...) gulu.CmdAttr(cmd) output, cmdErr := cmd.CombinedOutput() if nil != cmdErr { - logging.LogErrorf("add Windows Defender exclusion path [%s, %s] failed: %s, %s", installPath, util.WorkingDir, cmdErr, string(output)) + logging.LogErrorf("add Windows Defender exclusion path [%s, %s] failed: %s, %s", installPath, util.WorkspaceDir, cmdErr, string(output)) err = cmdErr return } } else { - logging.LogInfof("current user is not admin, use elevator to add Windows Defender exclusion path [%s, %s]", installPath, util.WorkingDir) + logging.LogInfof("current user is not admin, use elevator to add Windows Defender exclusion path [%s, %s]", installPath, util.WorkspaceDir) elevator := filepath.Join(util.WorkingDir, "elevator.exe") if "dev" == util.Mode || !gulu.File.IsExist(elevator) { elevator = filepath.Join(util.WorkingDir, "elevator", "elevator-"+runtime.GOARCH+".exe") @@ -83,13 +83,13 @@ func AddMicrosoftDefenderExclusion() (err error) { argPtr, _ := syscall.UTF16PtrFromString(strings.Join(ps, " ")) execErr := windows.ShellExecute(0, verbPtr, exePtr, argPtr, cwdPtr, 1) if execErr != nil { - logging.LogErrorf("add Windows Defender exclusion path [%s, %s] failed: %s", installPath, util.WorkingDir, execErr) + logging.LogErrorf("add Windows Defender exclusion path [%s, %s] failed: %s", installPath, util.WorkspaceDir, execErr) err = execErr return } } - logging.LogInfof("added Windows Defender exclusion path [%s, %s]", installPath, util.WorkingDir) + logging.LogInfof("added Windows Defender exclusion path [%s, %s]", installPath, util.WorkspaceDir) util.PushMsg(Conf.language(102), 5000) return }