desktop/icewm: Fixed (Don't clobber config files)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
dsomero 2012-09-28 20:25:19 -04:00 committed by Robby Workman
parent a9df89a5db
commit 3032ce580f
2 changed files with 18 additions and 3 deletions

View file

@ -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

View file

@ -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