feat: support for linux via bash

itschip · Sep 16, 2022 · faff8d9 · faff8d9
1 parent e036919
commit faff8d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/files.go b/files.go
@@ -12,8 +12,7 @@ func getConfigValues() {
   viper.SetConfigType("yaml")
   // Win
   viper.AddConfigPath("$HOME/.lazyfivem/")
-  // Linux
-  viper.AddConfigPath("etc/lazyfivem/")
+  viper.AddConfigPath("~/.lazyfivem/")
 
   err := viper.ReadInConfig()
   if err != nil {

diff --git a/fxserver.go b/fxserver.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"os/exec"
+	"runtime"
 
 	"github.com/jroimartin/gocui"
 )
@@ -32,7 +33,13 @@ func updateFxServer(g *gocui.Gui, line string) {
 
 func startFxServer(profile string, g *gocui.Gui) {
   path := Servers[profile]
-  CfxCmd = exec.Command(path)
+  os := runtime.GOOS
+  switch os {
+    case "windows":
+      CfxCmd = exec.Command(path)
+    case "linux":
+      CfxCmd = exec.Command("bash", "-c", path)
+  }
   Writer, _ = CfxCmd.StdinPipe()
 
   r, _ := CfxCmd.StdoutPipe()