From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 28 Apr 2020 12:42:34 +0000 (+0100)
Subject: dot/xinitrc: Fix detection of GTK 2.0-based `pterm'.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/d3dfca99c907fc64b8a72d6b506a331b5c9bcd4d

dot/xinitrc: Fix detection of GTK 2.0-based `pterm'.

Firstly, the match is usually preceded at least by whitespace, and
secondly, it seems that the library may, at least sometimes, be called
`libgtk-x11-2.0.so'.
---

diff --git a/dot/xinitrc b/dot/xinitrc
index e493b87..4e03412 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -278,10 +278,10 @@ case "$term" in
     ## The pterm width differs according to whether it's linked against Gtk 2
     ## or 3.  Let's find out...
     case $(ldd $(command -v pterm) | grep libgtk) in
-      libgtk-2*) t_wd=504 ;;
+      *libgtk-2* | *libgtk-x11-2*) t_wd=504 ;;
       *) t_wd=503 ;;
     esac
-    t_lineht=13 t_vextra=23 geom=-geometry;;
+   t_lineht=13 t_vextra=23 geom=-geometry;;
   Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;;
   xterm) t_wd=507 t_lineht=13 t_vextra=27 geom=-geometry;;
 esac