From 4b0bbb94a0129f7cfb971dbf49920e8e7b20e351 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 25 Aug 2012 13:53:05 -0400 Subject: [PATCH] Improve the pango trigger Use the new update-cache mode of pango-querymodules, which automatically finds the correct cache file location. Updated to look in both places by Colin Walters https://bugzilla.gnome.org/show_bug.cgi?id=682411 --- src/triggers/triggers.d/0070pango.trigger | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/triggers/triggers.d/0070pango.trigger b/src/triggers/triggers.d/0070pango.trigger index ad41e750..250d8960 100755 --- a/src/triggers/triggers.d/0070pango.trigger +++ b/src/triggers/triggers.d/0070pango.trigger @@ -20,6 +20,10 @@ # Boston, MA 02111-1307, USA. if test -x "$(which pango-querymodules 2>/dev/null)"; then - DEST=/etc/pango/pango.modules - pango-querymodules --system > ${DEST}.tmp && mv ${DEST}.tmp ${DEST} + # Support both old and new pango-querymodules; see + # http://git.gnome.org/browse/pango/commit/?id=9bbb992671140b840bedb4339f6c326a2ae2c072 + if ! pango-querymodules --system --update-cache; then + DEST=/etc/pango/pango.modules + pango-querymodules --system > ${DEST}.tmp && mv ${DEST}.tmp ${DEST} + fi fi