gg: fix system_font_path (#12533)

kahsa · web-flow · commit 480f3876ee81 · 2021-11-21T19:12:15.000+02:00
diff --git a/vlib/gg/text_rendering.v b/vlib/gg/text_rendering.v
@@ -76,14 +76,13 @@ pub fn system_font_path() string {
 			}
 		}
 	}
-	mut fm := os.execute('fc-match -v -s -b')
+	mut fm := os.execute("fc-match --format='%{file}\n' -s")
 	if fm.exit_code == 0 {
 		lines := fm.output.split('\n')
 		for l in lines {
-			if l.contains('file:') && !l.contains('.ttc') {
-				font := l.find_between('"', '"')
-				debug_font_println('Using font "$font"')
-				return font
+			if !l.contains('.ttc') {
+				debug_font_println('Using font "$l"')
+				return l
 			}
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,13 @@ pub fn system_font_path() string {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- mut fm := os.execute('fc-match -v -s -b')`
	`79`	`+ mut fm := os.execute("fc-match --format='%{file}\n' -s")`
`80`	`80`	`if fm.exit_code == 0 {`
`81`	`81`	`lines := fm.output.split('\n')`
`82`	`82`	`for l in lines {`
`83`		`- if l.contains('file:') && !l.contains('.ttc') {`
`84`		`- font := l.find_between('"', '"')`
`85`		`- debug_font_println('Using font "$font"')`
`86`		`- return font`
	`83`	`+ if !l.contains('.ttc') {`
	`84`	`+ debug_font_println('Using font "$l"')`
	`85`	`+ return l`
`87`	`86`	`}`
`88`	`87`	`}`
`89`	`88`	`} else {`