diff options
| author | Ponce <matteo.bernardini@sns.it> | 2010-10-17 09:28:14 -0400 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-10-17 20:16:51 -0500 |
| commit | aaed14602bae4bad693cf41467faabce9f8d41a6 (patch) | |
| tree | 37aa01ab8e25023ce02f2f373cb52250db49cc8a | |
| parent | ffb689d93795f1ead3a6bee7dcd99c70fe659771 (diff) | |
desktop/lxde-common: Fixed naming of config files.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | desktop/lxde-common/doinst.sh | 20 | ||||
| -rw-r--r-- | desktop/lxde-common/lxde-common.SlackBuild | 10 |
2 files changed, 3 insertions, 27 deletions
diff --git a/desktop/lxde-common/doinst.sh b/desktop/lxde-common/doinst.sh index 3d6e356f8ebd5..3857649f506a8 100644 --- a/desktop/lxde-common/doinst.sh +++ b/desktop/lxde-common/doinst.sh @@ -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 diff --git a/desktop/lxde-common/lxde-common.SlackBuild b/desktop/lxde-common/lxde-common.SlackBuild index f95a76a72cae1..e5dee807023cf 100644 --- a/desktop/lxde-common/lxde-common.SlackBuild +++ b/desktop/lxde-common/lxde-common.SlackBuild @@ -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 |