Changed GoConfig to UsrConfig
Changed GoConfig struct to UsrConfig
This commit is contained in:
@@ -7,7 +7,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func backUp(cmd string, c GoConfig) {
|
func backUp(cmd string, c UsrConfig) {
|
||||||
switch cmd {
|
switch cmd {
|
||||||
case "full":
|
case "full":
|
||||||
fmt.Println("Starting full server backup")
|
fmt.Println("Starting full server backup")
|
||||||
|
|||||||
4
cli.go
4
cli.go
@@ -19,9 +19,7 @@ func cliToolMode() {
|
|||||||
startStopServer("stop", c)
|
startStopServer("stop", c)
|
||||||
}
|
}
|
||||||
case "help", "h", "--help", "-h":
|
case "help", "h", "--help", "-h":
|
||||||
fmt.Printf("Start Server: %s start\nStop Server: %s stop\n", os.Args[0], os.Args[0])
|
fmt.Printf("Start Server: %s start\nStop Server: %s stop\nRun backup\n\tFull backup: %s backup full\n\tBackup saves: %s backup saves\n", os.Args[0], os.Args[0], os.Args[0], os.Args[0])
|
||||||
fmt.Printf("Run backup\n\tFull backup: %s backup full", os.Args[0])
|
|
||||||
fmt.Printf("\n\tBackup saves: %s backup saves\n", os.Args[0])
|
|
||||||
case "download":
|
case "download":
|
||||||
if len(os.Args) > 2 {
|
if len(os.Args) > 2 {
|
||||||
switch os.Args[2] {
|
switch os.Args[2] {
|
||||||
|
|||||||
@@ -9,14 +9,14 @@ import (
|
|||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func readCfg(factCfg string) GoConfig {
|
func readCfg(factCfg string) UsrConfig {
|
||||||
//read config file (YAML)
|
//read config file (YAML)
|
||||||
fileBytes, err := os.ReadFile(factCfg)
|
fileBytes, err := os.ReadFile(factCfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Error reading config file: %v", err)
|
log.Fatalf("Error reading config file: %v", err)
|
||||||
}
|
}
|
||||||
// return Struct
|
// return Struct
|
||||||
var config GoConfig
|
var config UsrConfig
|
||||||
err = yaml.Unmarshal(fileBytes, &config)
|
err = yaml.Unmarshal(fileBytes, &config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Error unmarshalling YAML file: %v", err)
|
log.Fatalf("Error unmarshalling YAML file: %v", err)
|
||||||
@@ -32,7 +32,7 @@ func isItReal(path string) bool { //check if path exists
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func verifyConfig(config GoConfig) bool { // check each file/dir to see if it exists
|
func verifyConfig(config UsrConfig) bool { // check each file/dir to see if it exists
|
||||||
if !isItReal(config.Server.ServDir) { //check for Server directory
|
if !isItReal(config.Server.ServDir) { //check for Server directory
|
||||||
fmt.Printf("PATH NOT FOUND: %s", config.Server.ServDir)
|
fmt.Printf("PATH NOT FOUND: %s", config.Server.ServDir)
|
||||||
return false
|
return false
|
||||||
|
|||||||
BIN
factoryman
BIN
factoryman
Binary file not shown.
@@ -7,7 +7,7 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
)
|
)
|
||||||
|
|
||||||
func startStopServer(cmd string, con GoConfig) {
|
func startStopServer(cmd string, con UsrConfig) {
|
||||||
switch cmd {
|
switch cmd {
|
||||||
case "start":
|
case "start":
|
||||||
x := fmt.Sprintf("%s --port %d --server-settings %s --start-server %s", con.Server.ServExec, con.Server.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)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
// config struct
|
// config struct
|
||||||
type GoConfig struct {
|
type UsrConfig struct {
|
||||||
Server struct { // server specific settings
|
Server struct { // server specific settings
|
||||||
ServDir string `yaml:"serverFolder"`
|
ServDir string `yaml:"serverFolder"`
|
||||||
WorldFile string `yaml:"worldFile"`
|
WorldFile string `yaml:"worldFile"`
|
||||||
|
|||||||
Reference in New Issue
Block a user