desktop/lxde-common: Fixed naming of config files.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
Ponce 2010-10-17 09:28:14 -04:00 committed by Robby Workman
parent ffb689d937
commit aaed14602b
2 changed files with 3 additions and 27 deletions

View File

@ -1,23 +1,3 @@
config() {
for infile in \$1; do
NEW="\$infile"
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...
done
}
config etc/xdg/lxsession/LXDE/autostart.new
config etc/xdg/lxsession/LXDE/desktop.conf.new
config etc/xdg/pcmanfm/main.lxde.new
config etc/xdg/pcmanfm/pcmanfm.conf.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
fi

View File

@ -46,7 +46,7 @@
PRGNAM=lxde-common
VERSION=${VERSION:-0.5.0}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@ -137,12 +137,8 @@ sed -i -e 's#pcmanfm#pcmanfm --desktop#' $PKG/etc/xdg/lxsession/LXDE/autostart
# set a default config for pcmanfm
mkdir -p $PKG/etc/xdg/pcmanfm
cp $CWD/config/default-pcmanfm.conf $PKG/etc/xdg/pcmanfm/pcmanfm.conf.new
cp $CWD/config/default-main.lxde $PKG/etc/xdg/pcmanfm/main.lxde.new
# Move configuration files that we do not want overwriting old ones:
mv $PKG/etc/xdg/lxsession/LXDE/autostart{,.new}
mv $PKG/etc/xdg/lxsession/LXDE/desktop.conf{,.new}
cp $CWD/config/default-pcmanfm.conf $PKG/etc/xdg/pcmanfm/pcmanfm.conf
cp $CWD/config/default-main.lxde $PKG/etc/xdg/pcmanfm/main.lxde
# Add documentation:
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION