From 63bd729f5fdb32d282efe72db4e88e7dbb852f33 Mon Sep 17 00:00:00 2001
From: ponce
Date: Tue, 27 Dec 2011 01:29:52 -0600
Subject: desktop/lxde-common: Updated for version 0.5.5

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
---
 desktop/lxde-common/doinst.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'desktop/lxde-common/doinst.sh')

diff --git a/desktop/lxde-common/doinst.sh b/desktop/lxde-common/doinst.sh
index 3857649f50..171fb69289 100644
--- a/desktop/lxde-common/doinst.sh
+++ b/desktop/lxde-common/doinst.sh
@@ -1,3 +1,19 @@
+config() {
+  NEW="$1"
+  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
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/xdg/lxsession/LXDE/desktop.conf.new
+config etc/xdg/pcmanfm/LXDE/pcmanfm.conf.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-- 
cgit v1.2.3