diff options
| author | dsomero <xgizzmo@slackbuilds.org> | 2012-09-29 07:31:30 -0400 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-09-29 17:17:41 -0500 |
| commit | 3dab92bb7876d82cf25dabbfd3a315f4bce02a6a (patch) | |
| tree | 0600676d2fbe4e28859a03513feec9449d8649ff | |
| parent | 4668c84c32bf26588dc2fba1ecd02d88abb296c9 (diff) | |
desktop/tint2: Fixed (Don't clobber config files)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | desktop/tint2/doinst.sh | 15 | ||||
| -rw-r--r-- | desktop/tint2/tint2.SlackBuild | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/desktop/tint2/doinst.sh b/desktop/tint2/doinst.sh index 5fb28930db0b9..b406deda514e7 100644 --- a/desktop/tint2/doinst.sh +++ b/desktop/tint2/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/xdg/tint2/tint2rc.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/desktop/tint2/tint2.SlackBuild b/desktop/tint2/tint2.SlackBuild index d502ffe051741..611cd9cdc460d 100644 --- a/desktop/tint2/tint2.SlackBuild +++ b/desktop/tint2/tint2.SlackBuild @@ -7,15 +7,13 @@ PRGNAM=tint2 VERSION=${VERSION:-0.11} -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 @@ -74,6 +72,8 @@ cd build make DESTDIR=$PKG install cd .. +mv $PKG/etc/xdg/tint2/tint2rc $PKG/etc/xdg/tint2/tint2rc.new + # Strip binaries find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |