sysinfo

cmd/vinegar/binary.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"strconv"
 	"os"
-	"time"
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"syscall"
+	"time"
 
 	bsrpc "github.com/vinegarhq/vinegar/bloxstraprpc"
 	"github.com/vinegarhq/vinegar/internal/config"
@@ -135,7 +135,7 @@ func (b *Binary) Run(args ...string) error {
 			log.Println("Another Roblox instance is already running, not killing wineprefix")
 			return
 		}
-	
+
 		if b.Config.AutoKillPrefix {
 			b.Prefix.Kill()
 		}

cmd/vinegar/vinegar.go

@@ -7,15 +7,14 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"slices"
 
 	"github.com/vinegarhq/vinegar/internal/config"
 	"github.com/vinegarhq/vinegar/internal/config/editor"
 	"github.com/vinegarhq/vinegar/internal/config/state"
 	"github.com/vinegarhq/vinegar/internal/dirs"
 	"github.com/vinegarhq/vinegar/internal/logs"
-	"github.com/vinegarhq/vinegar/sysinfo"
 	"github.com/vinegarhq/vinegar/roblox"
+	"github.com/vinegarhq/vinegar/sysinfo"
 	"github.com/vinegarhq/vinegar/wine"
 )
 
@@ -187,15 +186,9 @@ func Delete() {
 }
 
 func Sysinfo(pfx *wine.Prefix) {
-	cpu := sysinfo.GetCPU()
-	avx := slices.Contains(cpu.Flags, "avx")
-	k := sysinfo.GetKernel()
-	d, err := sysinfo.GetDistro()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	ver, err := pfx.Wine("--version").Output()
+	cmd := pfx.Wine("--version")
+	cmd.Stdout = nil // required for Output()
+	ver, err := cmd.Output()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -208,5 +201,5 @@ func Sysinfo(pfx *wine.Prefix) {
 * Wine: %s
 `
 
-	fmt.Printf(info, d, cpu.Model, avx, k, ver)
+	fmt.Printf(info, sysinfo.Distro, sysinfo.CPU, sysinfo.HasAVX, sysinfo.Kernel, ver)
 }

wine/cmd.go

@@ -2,9 +2,9 @@ package wine
 
 import (
 	"errors"
-	"os"
 	"io"
 	"log"
+	"os"
 	"os/exec"
 )
 
@@ -31,7 +31,7 @@ func (p *Prefix) Command(name string, arg ...string) *Cmd {
 	}
 
 	return &Cmd{
-		Cmd: cmd,
+		Cmd:       cmd,
 		prefixDir: p.dir,
 	}
 }
@@ -50,7 +50,7 @@ func (c *Cmd) OutputPipe() (io.Reader, error) {
 	if c.Process != nil {
 		return nil, errors.New("OutputPipe after process started")
 	}
-	
+
 	c.SetOutput(nil)
 
 	e, err := c.StderrPipe()

wine/prefix.go

@@ -13,11 +13,10 @@ type Prefix struct {
 	dir string
 }
 
-
 func New(dir string, out io.Writer) Prefix {
 	return Prefix{
 		Output: out,
-		dir: dir,
+		dir:    dir,
 	}
 }