Mirrored_Repos/rmmagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strip windows newlines on nix

Browse Source
This commit is contained in:
wh1te909 2022-03-23 22:55:10 +00:00
parent e455af7f1f
commit 118608999c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/agent_linux.go
View File

@ -133,6 +133,7 @@ func NewAgentConfig() *rmm.AgentConfig {
} }
func (a *Agent) RunScript(code string, shell string, args []string, timeout int) (stdout, stderr string, exitcode int, e error) { func (a *Agent) RunScript(code string, shell string, args []string, timeout int) (stdout, stderr string, exitcode int, e error) {
code = removeWinNewLines(code)
content := []byte(code) content := []byte(code)
f, err := os.CreateTemp("", "trmm") f, err := os.CreateTemp("", "trmm")

4
agent/utils.go
View File

@ -298,3 +298,7 @@ func randRange(min, max int) int {
func randomCheckDelay() { func randomCheckDelay() {
time.Sleep(time.Duration(randRange(300, 950)) * time.Millisecond) time.Sleep(time.Duration(randRange(300, 950)) * time.Millisecond)
} }
func removeWinNewLines(s string) string {
return strings.ReplaceAll(s, "\r\n", "\n")
}