applying opsramp changes

opsramp · Oct 18, 2023 · 076d8d7 · 076d8d7
1 parent 93d32e3
commit 076d8d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/host/host_darwin.go b/host/host_darwin.go
@@ -104,7 +104,7 @@ func PlatformInformationWithContext(ctx context.Context) (string, string, string
 	}
 
 	//added by opsramp
-	out, err = invoke.CommandWithContext(ctx, sw_vers, "-productName")
+	out, err := invoke.CommandWithContext(ctx, "sw_vers", "-productName")
 	if err == nil {
 		productName := strings.TrimSpace(string(out))
 		if strings.HasPrefix(productName, "Mac") {
@@ -115,7 +115,7 @@ func PlatformInformationWithContext(ctx context.Context) (string, string, string
 		family = productName
 	}
 
-	out, err := invoke.CommandWithContext(ctx, "sw_vers", "-productVersion")
+	out, err = invoke.CommandWithContext(ctx, "sw_vers", "-productVersion")
 	if err == nil {
 		pver = strings.ToLower(strings.TrimSpace(string(out)))
 		pver = strings.Replace(pver, "\"", "", -1)

diff --git a/host/host_linux.go b/host/host_linux.go
@@ -167,13 +167,13 @@ func getlsbStruct(ctx context.Context) (*lsbStruct, error) {
 			}
 			switch strings.TrimSpace(field[0]) {
 			case "Distributor ID":
-				ret.ID = strings.ReplaceAll(field[1], `"`, ``)
+				ret.ID = strings.TrimSpace(strings.ReplaceAll(field[1], `"`, ``))
 			case "Release":
-				ret.Release = strings.ReplaceAll(field[1], `"`, ``)
+				ret.Release = strings.TrimSpace(strings.ReplaceAll(field[1], `"`, ``))
 			case "Codename":
-				ret.Codename = strings.ReplaceAll(field[1], `"`, ``)
+				ret.Codename = strings.TrimSpace(strings.ReplaceAll(field[1], `"`, ``))
 			case "Description":
-				ret.Description = strings.ReplaceAll(field[1], `"`, ``)
+				ret.Description = strings.TrimSpace(strings.ReplaceAll(field[1], `"`, ``))
 			}
 		}