From 4d26f60eedc8d6685b273cebb9a23227eddb66c0 Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Thu, 27 Sep 2012 23:17:16 -0400
Subject: desktop/grun: Fixed (Don't clobber config files)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 desktop/grun/doinst.sh       | 15 +++++++++++++++
 desktop/grun/grun.SlackBuild |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 desktop/grun/doinst.sh

(limited to 'desktop')

diff --git a/desktop/grun/doinst.sh b/desktop/grun/doinst.sh
new file mode 100644
index 0000000000..76021c79bd
--- /dev/null
+++ b/desktop/grun/doinst.sh
@@ -0,0 +1,15 @@
+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/consfile.new
+config etc/gassoc.new
diff --git a/desktop/grun/grun.SlackBuild b/desktop/grun/grun.SlackBuild
index 4cb714f183..0faffb5bf5 100644
--- a/desktop/grun/grun.SlackBuild
+++ b/desktop/grun/grun.SlackBuild
@@ -23,15 +23,13 @@
 
 PRGNAM=grun
 VERSION=${VERSION:-0.9.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -84,6 +82,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+mv $PKG/etc/consfile $PKG/etc/consfile.new
+mv $PKG/etc/gassoc $PKG/etc/gassoc.new
+
 gzip -9 $PKG/usr/man/man?/*.?x
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-- 
cgit v1.2.3