diff --git a/config.go b/config.go index 9bc40c7..fb827f1 100644 --- a/config.go +++ b/config.go @@ -12,15 +12,15 @@ import ( const fmConfig = "config.yml" type GoConfig struct { - Server struct { + Server struct { // server specific settings ServDir string `yaml:"serverFolder"` WorldFile string `yaml:"worldFile"` ServCfg string `yaml:"serverSettings"` ServExec string `yaml:"serverExec"` + ServPort int `yaml:"port"` } `yaml:"server"` - Factoryman struct { - ServPort int `yaml:"port"` + Factoryman struct { // factoryman settings BackupDir string `yaml:"backupDir"` UseScreen bool `yaml:"screen"` ScreenName string `yaml:"screenName"` @@ -41,7 +41,7 @@ func readCfg(factCfg string) GoConfig { } return config } -func isItReal(path string) bool { +func isItReal(path string) bool { //check if path exists if _, err := os.Stat(path); err == nil { return true } else if errors.Is(err, os.ErrNotExist) { @@ -50,7 +50,7 @@ func isItReal(path string) bool { return false } } -func verifyConfig(config GoConfig) bool { +func verifyConfig(config GoConfig) bool { // check each file/dir to see if it exists if !isItReal(config.Server.ServDir) { fmt.Printf("PATH NOT FOUND: %s", config.Server.ServDir) return false diff --git a/config.yml b/config.yml index f2d1539..7952d8d 100644 --- a/config.yml +++ b/config.yml @@ -3,10 +3,9 @@ server: worldFile: "factorio/data/saves/newworld.zip" serverSettings: "factorio/data/server-settings.json" serverExec: "factorio/bin/x64/factorio" - - -factoryman: port: 34197 + +factoryman: screen: True screenName: "Factorio" backupDir: "factorio/backups" \ No newline at end of file diff --git a/launchserver.go b/launchserver.go index 3fea96e..c863cf2 100644 --- a/launchserver.go +++ b/launchserver.go @@ -10,7 +10,7 @@ import ( func startStopServer(cmd string, con GoConfig) { switch cmd { case "start": - x := fmt.Sprintf("%s --port %d --server-settings %s --start-server %s", con.Server.ServExec, con.Factoryman.ServPort, con.Server.ServCfg, con.Server.WorldFile) + x := fmt.Sprintf("%s --port %d --server-settings %s --start-server %s", con.Server.ServExec, con.Server.ServPort, con.Server.ServCfg, con.Server.WorldFile) if con.Factoryman.UseScreen { // if screen enabled in confing.yml fmt.Println("Starting factorio server in screen session") startScreenCmd := exec.Command("screen", "-dmS", con.Factoryman.ScreenName, "bash", "-c", x, "; exec sh")