From 50f022a3033094def81cfb8cabda7c930c209e88 Mon Sep 17 00:00:00 2001 From: DaanSelen Date: Wed, 1 Apr 2026 12:23:49 +0200 Subject: [PATCH] chore: try old method --- src/modules/runner/runner_linux.go | 73 -------------------------- src/modules/runner/runner_windows.go | 77 ---------------------------- 2 files changed, 150 deletions(-) delete mode 100644 src/modules/runner/runner_linux.go delete mode 100644 src/modules/runner/runner_windows.go diff --git a/src/modules/runner/runner_linux.go b/src/modules/runner/runner_linux.go deleted file mode 100644 index 8b8b97b..0000000 --- a/src/modules/runner/runner_linux.go +++ /dev/null @@ -1,73 +0,0 @@ -//go:build linux -// +build linux - -package runner - -import ( - "log" - "os" - "os/exec" - "regexp" - "runtime" -) - -var ansi = regexp.MustCompile(`\x1b\[[0-9;]*m`) - -func FindMeshbookBinary() (bool, string) { - var osBin string - - switch runtime.GOOS { - case "windows": - osBin = "meshbook.exe" - case "linux": - osBin = "meshbook" - default: - log.Println("undefined operating system") - } - - log.Println("going to search for:", osBin) - - binaryFound := false - var binaryPath string - for _, f := range []string{("./" + osBin), ("./bin/" + osBin)} { - objInfo, err := os.Stat(f) - - if err == nil && objInfo.Mode().IsRegular() { - binaryFound = true - binaryPath = f - log.Printf("found binary at %s", f) - break - } - } - - if binaryFound { - return true, binaryPath - } else { - log.Println("binary not found!") - return false, "" - } -} - -func RunMeshbook(binPath, bookPath, targGroup string) (bool, string) { - var args []string - if len(bookPath) == 0 { - args = []string{"--help"} - } else { - args = []string{"--nograce", "--indent", "-mb", bookPath, "--group", targGroup} - } - log.Printf("running with parameters: %v", args) - - cmd := exec.Command(binPath, args...) - - outputData, err := cmd.CombinedOutput() - cleanData := ansi.ReplaceAllString(string(outputData), "") - - if err != nil { - log.Printf("something went wrong when running the command: %v", err) - log.Printf("captured output: %s", cleanData) - - return false, cleanData - } else { - return true, cleanData - } -} diff --git a/src/modules/runner/runner_windows.go b/src/modules/runner/runner_windows.go deleted file mode 100644 index 3b1928e..0000000 --- a/src/modules/runner/runner_windows.go +++ /dev/null @@ -1,77 +0,0 @@ -//go:build windows -// +build windows - -package runner - -import ( - "log" - "os" - "os/exec" - "regexp" - "runtime" - "syscall" -) - -var ansi = regexp.MustCompile(`\x1b\[[0-9;]*m`) - -func FindMeshbookBinary() (bool, string) { - var osBin string - - switch runtime.GOOS { - case "windows": - osBin = "meshbook.exe" - case "linux": - osBin = "meshbook" - default: - log.Println("undefined operating system") - } - - log.Println("going to search for:", osBin) - - binaryFound := false - var binaryPath string - for _, f := range []string{("./" + osBin), ("./bin/" + osBin)} { - objInfo, err := os.Stat(f) - - if err == nil && objInfo.Mode().IsRegular() { - binaryFound = true - binaryPath = f - log.Printf("found binary at %s", f) - break - } - } - - if binaryFound { - return true, binaryPath - } else { - log.Println("binary not found!") - return false, "" - } -} - -func RunMeshbook(binPath, bookPath, targGroup string) (bool, string) { - var args []string - if len(bookPath) == 0 { - args = []string{"--help"} - } else { - args = []string{"--nograce", "--indent", "-mb", bookPath, "--group", targGroup} - } - log.Printf("running with parameters: %v", args) - - cmd := exec.Command(binPath, args...) - cmd.SysProcAttr = &syscall.SysProcAttr{ - HideWindow: true, - } - - outputData, err := cmd.CombinedOutput() - cleanData := ansi.ReplaceAllString(string(outputData), "") - - if err != nil { - log.Printf("something went wrong when running the command: %v", err) - log.Printf("captured output: %s", cleanData) - - return false, cleanData - } else { - return true, cleanData - } -}