From 3032ce580f99e781f534ffa6cad45bd039950b58 Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Fri, 28 Sep 2012 20:25:19 -0400
Subject: desktop/icewm: Fixed (Don't clobber config files)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 desktop/icewm/doinst.sh        | 15 +++++++++++++++
 desktop/icewm/icewm.SlackBuild |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'desktop/icewm')

diff --git a/desktop/icewm/doinst.sh b/desktop/icewm/doinst.sh
index a9ca19693875..ca452f155f27 100644
--- a/desktop/icewm/doinst.sh
+++ b/desktop/icewm/doinst.sh
@@ -1,3 +1,18 @@
+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/X11/xinit/xinitrc.icewm.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null
 fi
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index cee603725634..f478f59e40a5 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=icewm
 VERSION=${VERSION:-1.3.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -105,8 +105,8 @@ gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz
 
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm
+cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm.new
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm.new
 
 # Add icewm as a session choice for !kdm desktop managers
 mkdir -p $PKG/usr/share/xsessions
-- 
cgit v1.2.3