term_font: Fix st font2 issue. Closes #1446

2020-10-04 14:44:04 +03:00 · 2020-10-04 14:44:04 +03:00 · 566c8096da
parent 1c468b4e31
commit 566c8096da
1 changed files with 7 additions and 6 deletions
--- a/13
+++ b/13
@ -3409,15 +3409,16 @@ END
                # like a font definition. NOTE: There is a slight limitation in this approach.
                # Technically "Font Name" is a valid font. As it doesn't specify any font options
                # though it is hard to match it correctly amongst the rest of the noise.
-                [[ -n "$binary" ]] && \
-                    term_font="$(strings "$binary" | grep -F -m 1 \
-                                                          -e "pixelsize=" \
-                                                          -e "size=" \
-                                                          -e "antialias=" \
-                                                          -e "autohint=")"
+                [[ -n "$binary" ]] &&
+                    term_font=$(
+                        strings "$binary" |
+
+                        grep -m 1 "*font[^2]"
+                    )
            fi

            term_font="${term_font/xft:}"
+            term_font="${term_font#*=}"
            term_font="${term_font/:*}"
        ;;