feat(bootstrapper): uninstall webview2 properly

Author: sewnie

cmd/vinegar/bootstrapper_run.go

@@ -38,11 +38,6 @@ func (b *bootstrapper) command(args ...string) (*wine.Cmd, error) {
 }
 
 func (b *bootstrapper) execute(args ...string) error {
-	defer gtkutil.IdleAdd(func() {
-		b.app.RemoveWindow(&b.win.Window)
-		b.win.SetVisible(false) // Incase bailed out
-	})
-
 	cmd, err := b.command(args...)
 	if err != nil {
 		return err

cmd/vinegar/bootstrapper_setup_pfx.go

@@ -66,9 +66,9 @@ func (b *bootstrapper) stepSetupDxvk() error {
 		return nil
 	}
 
-	b.message("Checking DXVK", "version", b.cfg.Studio.DXVK)
-
 	new := string(b.cfg.Studio.DXVK)
+	b.message("Checking DXVK", "version", new)
+
 	current, err := dxvk.Version(b.pfx)
 	if err != nil {
 		return fmt.Errorf("get version: %w", err)
@@ -89,7 +89,7 @@ func (b *bootstrapper) stepSetupDxvk() error {
 	}
 
 	if err := netutil.DownloadProgress(
-		dxvk.URL(b.cfg.Studio.DXVK.String()), name, &b.pbar); err != nil {
+		dxvk.URL(new), name, &b.pbar); err != nil {
 		return fmt.Errorf("download: %w", err)
 	}
 
@@ -118,10 +118,6 @@ func (b *bootstrapper) webviewInstaller() string {
 	return filepath.Join(dirs.Cache, "webview-"+b.cfg.Studio.WebView+".exe")
 }
 
-func (b *bootstrapper) webviewPath() string {
-	return filepath.Join(b.pfx.Dir(), "drive_c/Program Files (x86)/Microsoft/EdgeWebView/Application", b.cfg.Studio.WebView)
-}
-
 func (b *bootstrapper) stepWebviewDownload() error {
 	name := b.webviewInstaller()
 	if name == "" {
@@ -145,18 +141,22 @@ func (b *bootstrapper) stepWebviewDownload() error {
 }
 
 func (b *bootstrapper) stepWebviewInstall() error {
-	name := b.webviewInstaller()
-	path := b.webviewPath()
+	new := b.cfg.Studio.WebView
+	b.message("Checking WebView", "version", new)
 
-	_, err := os.Stat(path)
-	if err == nil && name == "" {
-		b.message("Uninstalling WebView")
-
-		return os.RemoveAll(path)
-	} else if name == "" || (err == nil && name != "") {
+	current := webview2.Current(b.pfx)
+	if current != "" && current != b.cfg.Studio.WebView {
+		b.message("Uninstalling WebView", "current", current, "new", new)
+		if err := webview2.Uninstall(b.pfx, current); err != nil {
+			return fmt.Errorf("uninstall: %w", err)
+		}
+	}
+	if current == new || new == "" {
 		return nil
 	}
 
+	name := b.webviewInstaller()
+
 	b.message("Installing WebView", "path", name)
 	defer b.performing()()
 

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/lmittmann/tint v1.1.2
 	github.com/sewnie/rbxbin v0.0.0-20251006114257-d7e318b45616
 	github.com/sewnie/rbxweb v0.0.0-20250923154144-a174c75bba5d
-	github.com/sewnie/wine v0.0.0-20251014070639-2dcf49b54017
+	github.com/sewnie/wine v0.0.0-20251014081238-11b6564ffdf5
 )
 
 require (

go.sum

@@ -24,8 +24,8 @@ github.com/sewnie/rbxbin v0.0.0-20251006114257-d7e318b45616 h1:saD5MNBSS4LsP7met
 github.com/sewnie/rbxbin v0.0.0-20251006114257-d7e318b45616/go.mod h1:Ksjrzt8x1UY2ot2QdDrJXYhTEQOjWH8US0CHgKcH+QY=
 github.com/sewnie/rbxweb v0.0.0-20250923154144-a174c75bba5d h1:9+O1OzqsVhNJVPewE7oJqVymRlm+ej8iArdafc7vfKs=
 github.com/sewnie/rbxweb v0.0.0-20250923154144-a174c75bba5d/go.mod h1:nSfgVAspLMsixAWAfuTXAjBsiTyMchPxTx+jD3TrM20=
-github.com/sewnie/wine v0.0.0-20251014070639-2dcf49b54017 h1:8iezVb+A1dHEnAO632IIF+n/TiSa5I/8zd4IJlVzSWw=
-github.com/sewnie/wine v0.0.0-20251014070639-2dcf49b54017/go.mod h1:IbKiMCPd3jWSTrVXxDh4ggy3bvcaNUtI4VnPG9mRYoY=
+github.com/sewnie/wine v0.0.0-20251014081238-11b6564ffdf5 h1:SvjAiNZ0l43P5fyJ5hoVRZLFte/uxeDLz2gcjEB0fYY=
+github.com/sewnie/wine v0.0.0-20251014081238-11b6564ffdf5/go.mod h1:IbKiMCPd3jWSTrVXxDh4ggy3bvcaNUtI4VnPG9mRYoY=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=