Skip to content

Commit

Permalink
remove UMU support; too unpredictable
Browse files Browse the repository at this point in the history
  • Loading branch information
apprehensions committed Feb 11, 2025
1 parent 6d18e01 commit 87c713b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 2 additions & 5 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package config
import (
"errors"
"fmt"
"log/slog"
"os"
"os/exec"
"strings"
Expand All @@ -13,7 +12,6 @@ import (
"github.com/apprehensions/rbxbin"
"github.com/apprehensions/wine"
"github.com/vinegarhq/vinegar/internal/dirs"
"github.com/vinegarhq/vinegar/sysinfo"
)

// Studio is a representation of the deployment and behavior
Expand Down Expand Up @@ -129,14 +127,13 @@ func (s *Studio) setup() error {
}

if s.WineRoot != "" {
// Check if constructing a Wine command from the WineRoot is erroneous,
// such as wine64 being missing.
pfx := wine.New("", s.WineRoot)
w := pfx.Wine("")
if w.Err != nil {
return fmt.Errorf("wineroot: %w", w.Err)
}
if pfx.IsProton() && w.Args[0] != "umu-run" && !sysinfo.InFlatpak {
slog.Warn("wineroot: umu-run recommended for Proton usage!")
}
}

if err := s.FFlags.SetRenderer(s.Renderer); err != nil {
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/altfoxie/drpc v0.0.0-20240929140334-e714e6291275
github.com/apprehensions/rbxbin v0.0.0-20250127194138-e1b385050444
github.com/apprehensions/rbxweb v0.0.0-20240329184049-0bdedc184942
github.com/apprehensions/wine v0.0.0-20250209200938-16e6e976d70e
github.com/apprehensions/wine v0.0.0-20250211082328-b661ff87ef87
github.com/godbus/dbus/v5 v5.1.0
github.com/jwijenbergh/puregotk v0.0.0-20240827133221-51f7e663a5e9
github.com/lmittmann/tint v1.0.7
Expand All @@ -37,3 +37,5 @@ retract (
[v1.0.0, v1.1.3]
v0.0.1
)

replace github.com/apprehensions/wine => ../wine

0 comments on commit 87c713b

Please sign in to comment.