aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-29 17:14:14 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-29 17:17:44 -0500
commitd8162914b2dd83e550558cb93f4c1f2450eaad8a (patch)
tree1bd0e3c44ff3d079ee297b817ad1beee4abd4391
parent3b295623cc1c159049ba7673fbaa61d89d545767 (diff)
games/fgrun: Fixed (Don't clobber config files)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--games/fgrun/doinst.sh15
-rw-r--r--games/fgrun/fgrun.SlackBuild4
2 files changed, 17 insertions, 2 deletions
diff --git a/games/fgrun/doinst.sh b/games/fgrun/doinst.sh
index 4e8ba7071dea7..3a6025a779546 100644
--- a/games/fgrun/doinst.sh
+++ b/games/fgrun/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/fltk/flightgear.org/fgrun.prefs.new
+
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
diff --git a/games/fgrun/fgrun.SlackBuild b/games/fgrun/fgrun.SlackBuild
index 944b6f20f208a..e0b2e1523d487 100644
--- a/games/fgrun/fgrun.SlackBuild
+++ b/games/fgrun/fgrun.SlackBuild
@@ -4,7 +4,7 @@
PRGNAM=fgrun
VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -65,7 +65,7 @@ cd build
cd ..
mkdir -p $PKG/etc/fltk/flightgear.org
-install -m 0644 $CWD/fgrun.prefs $PKG/etc/fltk/flightgear.org/fgrun.prefs
+install -m 0644 $CWD/fgrun.prefs $PKG/etc/fltk/flightgear.org/fgrun.prefs.new
mkdir -p $PKG/usr/share/{applications,pixmaps}
install -m 0644 $CWD/fgrun.desktop $PKG/usr/share/applications/