summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author dsomero <xgizzmo@slackbuilds.org>2011-03-23 18:22:28 -0400
committer Robby Workman <rworkman@slackbuilds.org>2011-03-24 19:23:17 -0500
commitfb006f6765947a82d31569ed7b9be6cd05156614 (patch)
tree4c6ec593a4ff97e95b9940440dbb2f3665af8994
parentf35a82cdaba1d20ada6c8d8aee1da6767a8f5d8d (diff)
downloadslackbuilds-fb006f6765947a82d31569ed7b9be6cd05156614.tar.gz
slackbuilds-fb006f6765947a82d31569ed7b9be6cd05156614.tar.xz
system/set_rlimits: Handle .new files correctly.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--system/set_rlimits/doinst.sh26
-rw-r--r--system/set_rlimits/set_rlimits.SlackBuild1
2 files changed, 27 insertions, 0 deletions
diff --git a/system/set_rlimits/doinst.sh b/system/set_rlimits/doinst.sh
new file mode 100644
index 0000000000..e2f3fb9c0c
--- /dev/null
+++ b/system/set_rlimits/doinst.sh
@@ -0,0 +1,26 @@
+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...
+}
+
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
+
+preserve_perms etc/set_rlimits.conf.new
+
diff --git a/system/set_rlimits/set_rlimits.SlackBuild b/system/set_rlimits/set_rlimits.SlackBuild
index af906c6d86..8eed873681 100644
--- a/system/set_rlimits/set_rlimits.SlackBuild
+++ b/system/set_rlimits/set_rlimits.SlackBuild
@@ -72,6 +72,7 @@ cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuil
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}