Correctly detect product name and product version number

Signed-off-by: Ricardo Mateus <rmateus@suse.com>

inter-server-sync.changes

@@ -1,3 +1,5 @@
+  * Correctly detect product name and product version number
+
 -------------------------------------------------------------------
 Wed Feb  8 10:41:54 UTC 2023 - Cédric Bosdonnat <cbosdonnat@suse.com>
 

utils/utils.go

@@ -107,8 +107,8 @@ func GetCurrentServerFQDN(serverConfig string) string {
 }
 
 func getProperty(filePaths []string, names []string) (string, error) {
-	for _, path := range filePaths {
-		for _, search := range names {
+	for _, search := range names {
+		for _, path := range filePaths {
 			p, err := ScannerFunc(path, search)
 			if err == nil {
 				return p, nil
@@ -119,24 +119,25 @@ func getProperty(filePaths []string, names []string) (string, error) {
 }
 
 func ScannerFunc(path string, search string) (string, error) {
-	var output string
 	f, err := os.Open(path)
 	if err != nil {
 		log.Fatal().Msgf("Couldn't open file: %s", path)
 	}
 	defer f.Close()
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
-		if strings.Contains(scanner.Text(), search) {
-			splits := strings.Split(scanner.Text(), "=")
-			output = splits[1]
-			if output == " SUSE Manager" {
-				output = strings.Replace(output, " SUSE Manager", "SUSE Manager", 1)
-			} else {
-				splits = strings.Split(output, " ")
-				output = splits[len(splits)-1]
-			}
-			return output, nil
+		linetext := scanner.Text()
+
+		index := strings.Index(linetext, "=")
+		if index < 0 {
+			continue
+		}
+
+		key := strings.Trim(linetext[:index], " ")
+		value := strings.Trim(linetext[index+1:], " ")
+
+		if key == search {
+			return value, nil
 		}
 	}
 	return "", fmt.Errorf("String not found!")