improve messages; Kill Discord on Windows before patching

Author: Vendicated

find_discord_darwin.go

@@ -56,6 +56,8 @@ func FindDiscords() []any {
 	return discords
 }
 
+func PreparePatch(di *DiscordInstall) {}
+
 func FixOwnership(_ string) error {
 	return nil
 }

find_discord_linux.go

@@ -129,7 +129,7 @@ func FindDiscords() []any {
 	return discords
 }
 
-// Not actually find_discord but no need to have this in the binary on Windows/Mac
+func PreparePatch(di *DiscordInstall) {}
 
 // FixOwnership fixes file ownership on Linux
 func FixOwnership(p string) error {

find_discord_windows.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	path "path/filepath"
 	"strings"
 )
@@ -83,6 +84,13 @@ func FindDiscords() []any {
 	return discords
 }
 
+func PreparePatch(di *DiscordInstall) {
+	name := windowsNames[di.branch]
+	fmt.Println("Killing " + name + "...")
+
+	_ = exec.Command("powershell", "Stop-Process -Name "+name).Run()
+}
+
 func FixOwnership(_ string) error {
 	return nil
 }

gui.go

@@ -164,7 +164,7 @@ func handleOpenAsarConfirmed() {
 
 func handleErr(err error, action string) {
 	if errors.Is(err, os.ErrPermission) {
-		switch os := runtime.GOOS; os {
+		switch runtime.GOOS {
 		case "windows":
 			err = errors.New("Permission denied. Make sure your Discord is fully closed (from the tray)!")
 		case "darwin":
@@ -483,9 +483,9 @@ func renderInstaller() g.Widget {
 		),
 
 		InfoModal("#downloaded", "Successfully Downloaded", "The Vencord files were successfully downloaded!"),
-		InfoModal("#patched", "Successfully Patched", "You must now fully close Discord (from the tray).\n"+
-			"Then, verify Vencord installed successfully by looking for its category in Discord Settings"),
-		InfoModal("#unpatched", "Successfully Unpatched", "You must now fully close Discord (from the tray)"),
+		InfoModal("#patched", "Successfully Patched", "If Discord is still open, fully close it first.\n"+
+			"Then, start it and verify Vencord installed successfully by looking for its category in Discord Settings"),
+		InfoModal("#unpatched", "Successfully Unpatched", "If Discord is still open, fully close it first. Then start it again, it should be back to stock!"),
 		InfoModal("#scuffed-install", "Hold On!", "You have a broken Discord Install.\n"+
 			"Sometimes Discord decides to install to the wrong location for some reason!\n"+
 			"You need to fix this before patching, otherwise Vencord will likely not work.\n\n"+
@@ -497,8 +497,8 @@ func renderInstaller() g.Widget {
 			"You're installing OpenAsar at your own risk. If you run into issues with OpenAsar,\n"+
 			"no support will be provided, join the OpenAsar Server instead!\n\n"+
 			"To install OpenAsar, press Accept and click 'Install OpenAsar' again.", true),
-		InfoModal("#openasar-patched", "Successfully Installed OpenAsar", "You must now fully close Discord (from the tray)"),
-		InfoModal("#openasar-unpatched", "Successfully Uninstalled OpenAsar", "You must now fully close Discord (from the tray)"),
+		InfoModal("#openasar-patched", "Successfully Installed OpenAsar", "If Discord is still open, fully close it first. Then start it again and verify OpenAsar installed successfully!"),
+		InfoModal("#openasar-unpatched", "Successfully Uninstalled OpenAsar", "If Discord is still open, fully close it first. Then start it again and it should be back to stock!"),
 		InfoModal("#modal"+strconv.Itoa(modalId), modalTitle, modalMessage),
 	}
 

openasar.go

@@ -65,6 +65,8 @@ func (di *DiscordInstall) IsOpenAsar() (retBool bool) {
 }
 
 func (di *DiscordInstall) InstallOpenAsar() error {
+	PreparePatch(di)
+
 	dir := path.Join(di.appPath, "..")
 	asarFile, err := FindAsarFile(dir)
 	if err != nil {
@@ -97,6 +99,8 @@ func (di *DiscordInstall) InstallOpenAsar() error {
 }
 
 func (di *DiscordInstall) UninstallOpenAsar() error {
+	PreparePatch(di)
+	
 	dir := path.Join(di.appPath, "..")
 	originalAsar := path.Join(dir, "app.asar.original")
 	if !ExistsFile(originalAsar) {

patcher.go

@@ -149,6 +149,8 @@ func (di *DiscordInstall) patch() error {
 		}
 	}
 
+	PreparePatch(di)
+
 	if di.isPatched {
 		fmt.Println(di.path, "is already patched. Unpatching first...")
 		if err := di.unpatch(); err != nil {
@@ -269,6 +271,8 @@ func unpatchRenames(dir string, isSystemElectron bool) (errOut error) {
 func (di *DiscordInstall) unpatch() error {
 	fmt.Println("Unpatching " + di.path + "...")
 
+	PreparePatch(di)
+
 	if di.isSystemElectron {
 		fmt.Println("Detected as System Electron Install")
 		// See comment in Patch