Skip to content

Commit

Permalink
cmd/vinegar: update wine usage
Browse files Browse the repository at this point in the history
  • Loading branch information
apprehensions committed Mar 8, 2024
1 parent c1abf31 commit 6d533e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
6 changes: 1 addition & 5 deletions cmd/vinegar/binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ func NewBinary(bt clientsettings.BinaryType, cfg *config.Config) (*Binary, error
bstate = &s.Studio
}

pfx, err := wine.New(BinaryPrefixDir(bt), bcfg.WineRoot)
if err != nil {
return nil, fmt.Errorf("new prefix %s: %w", bt, err)
}

pfx := wine.New(BinaryPrefixDir(bt), bcfg.WineRoot)
os.Setenv("GAMEID", "ulwgl-roblox")

return &Binary{
Expand Down
12 changes: 2 additions & 10 deletions cmd/vinegar/sysinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"fmt"
"log"
"path"
"runtime/debug"

Expand All @@ -13,15 +12,8 @@ import (
)

func PrintSysinfo(cfg *config.Config) {
playerPfx, err := wine.New(BinaryPrefixDir(clientsettings.WindowsPlayer), cfg.Player.WineRoot)
if err != nil {
log.Fatalf("player prefix: %s", err)
}

studioPfx, err := wine.New(BinaryPrefixDir(clientsettings.WindowsStudio64), cfg.Studio.WineRoot)
if err != nil {
log.Fatalf("studio prefix: %s", err)
}
playerPfx := wine.New(BinaryPrefixDir(clientsettings.WindowsPlayer), cfg.Player.WineRoot)
studioPfx := wine.New(BinaryPrefixDir(clientsettings.WindowsStudio64), cfg.Studio.WineRoot)

var revision string
bi, _ := debug.ReadBuildInfo()
Expand Down

0 comments on commit 6d533e7

Please sign in to comment.