diff options
Diffstat (limited to 'source/l/gtk+2/update-gtk-immodules-2.0')
| -rw-r--r-- | source/l/gtk+2/update-gtk-immodules-2.0 | 64 |
1 files changed, 13 insertions, 51 deletions
diff --git a/source/l/gtk+2/update-gtk-immodules-2.0 b/source/l/gtk+2/update-gtk-immodules-2.0 index d913f69f..f12353fb 100644 --- a/source/l/gtk+2/update-gtk-immodules-2.0 +++ b/source/l/gtk+2/update-gtk-immodules-2.0 @@ -1,5 +1,5 @@ #! /bin/sh -# Updates the immodules in /etc/gtk-2.0/$host +# Updates the immodules cache at /usr/lib(64)/gtk-2.0/2.10.0/immodules.cache umask 022 @@ -11,75 +11,37 @@ case "$host" in arm*) host=arm-slackware-linux-gnueabi ;; esac -# Deriving /etc/gtk-2.0/$host location -# -# We have had problems in the past with build systems -# changing host from i386 to i686 and appending/dropping -# the -gnu suffix, so try to match up the $host we got -# with whats actually there. -if [ ! -d /etc/gtk-2.0/$host ]; then - case "$host" in - i?86*) - for d in $(ls -d /etc/gtk-2.0/i?86*); do - host=$(basename $d) - break - done - ;; - esac -fi - -FILE=/etc/gtk-2.0/$host/gtk.immodules - case "$host" in s390x*|x86_64*) if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0-64 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0-64 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0-64 > $FILE - # Check for x86_64 multilib: - if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then - for d in $(ls -d /etc/gtk-2.0/i?86*); do - mlhost=$(basename $d) - break - done - if [ -r /etc/gtk-2.0/$mlhost/gtk.immodules -a \ - -x /usr/bin/gtk-query-immodules-2.0-32 ]; then - FILE=/etc/gtk-2.0/$mlhost/gtk.immodules - if [ "$1" = "--verbose" ]; then - echo "Updating gtk.immodules for ${mlhost}:" - echo " /usr/bin/gtk-query-immodules-2.0-32 \\" - echo " > $FILE" - fi - /usr/bin/gtk-query-immodules-2.0-32 > $FILE + /usr/bin/gtk-query-immodules-2.0-64 --update-cache 2>/dev/null + # Check for multilib + if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating 32bit gtk.immodules: " + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" fi + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null fi - else - if [ "$1" = "--verbose" ]; then - echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0 \\" - echo " > $FILE" - fi - /usr/bin/gtk-query-immodules-2.0 > $FILE fi ;; *) if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0-32 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0-32 > $FILE + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null else if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0 > $FILE + /usr/bin/gtk-query-immodules-2.0 --update-cache 2>/dev/null fi ;; esac |