1 files changed, 9 insertions, 22 deletions
diff --git a/source/l/gtk+2/doinst.sh b/source/l/gtk+2/doinst.sh
index 1122e0cd7..18d5fb272 100644
--- a/source/l/gtk+2/doinst.sh
+++ b/source/l/gtk+2/doinst.sh
@@ -1,35 +1,18 @@
-#!/bin/sh
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-if [ -d etc/gtk-2.0/$(uname -m)-slackware-linux ]; then
-  config etc/gtk-2.0/$(uname -m)-slackware-linux/im-multipress.conf.new
-elif [ -d etc/gtk-2.0/i486-slackware-linux ]; then
-  config etc/gtk-2.0/i486-slackware-linux/im-multipress.conf.new
-elif [ -d etc/gtk-2.0/*-slackware-linux ]; then
-  config etc/gtk-2.0/*-slackware-linux/im-multipress.conf.new
-fi
 
-# Since the use of icon caching is optional, and has to be kept in sync
-# somehow (like a "registry" through a cron job, or whatever, I tend to
-# think the user should be the one to choose if they really want to set
-# this up or not:
-#
-# Example:
-#for dir in /usr/share/icons/* ; do
-#  if [ -d $dir ]; then
-#    /usr/bin/gtk-update-icon-cache -f -t $dir 1> /dev/null 2> /dev/null
-#  fi
-#done
-mkdir -p etc/gtk-2.0
+config etc/gtk-2.0/gtkrc.new
+config etc/gtk-2.0/im-multipress.conf.new
+rm -f etc/gtk-2.0/gtkrc.new
 
 chroot . rm -f /usr/share/icons/*/icon-theme.cache 1> /dev/null 2> /dev/null
 
@@ -39,3 +22,7 @@ if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then
   /usr/bin/update-gtk-immodules
 fi
 
+# In case this is the first run installing the standalone gdk-pixbuf,
+# we will run this a second time to fix machines that will not reboot.
+chroot . /usr/bin/update-gdk-pixbuf-loaders 1> /dev/null 2> /dev/null
+