summaryrefslogtreecommitdiff
path: root/network/tor/doinst.sh
diff options
context:
space:
mode:
authorErik Hanson <erik@slackbuilds.org>2010-05-13 00:38:27 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-13 00:38:27 +0200
commit3be86dfb0f559ae557987a0ba6148307fd6c183b (patch)
treed669221cda2ce8757a55918cf0c95cfac945cb60 /network/tor/doinst.sh
parent2c77f99062c89beea3e4dfcd29ced8bfcbae1b0f (diff)
downloadslackbuilds-3be86dfb0f559ae557987a0ba6148307fd6c183b.tar.gz
network/tor: Updated for version 0.2.1.22
Diffstat (limited to 'network/tor/doinst.sh')
-rw-r--r--network/tor/doinst.sh26
1 files changed, 15 insertions, 11 deletions
diff --git a/network/tor/doinst.sh b/network/tor/doinst.sh
index 36769c85ca..6e645431c8 100644
--- a/network/tor/doinst.sh
+++ b/network/tor/doinst.sh
@@ -1,24 +1,28 @@
-#!/bin/sh
-
config() {
NEW="$1"
- OLD="`dirname $NEW`/`basename $NEW .new`"
+ 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
+ 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...
}
-# Keep same perms on rc.tor.new:
-if [ -e etc/rc.d/rc.tor ]; then
- cp -a etc/rc.d/rc.tor etc/rc.d/rc.tor.new.incoming
- cat etc/rc.d/rc.tor.new > etc/rc.d/rc.tor.new.incoming
- mv etc/rc.d/rc.tor.new.incoming etc/rc.d/rc.tor.new
-fi
+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
+}
-config etc/rc.d/rc.tor.new
+preserve_perms etc/rc.d/rc.tor.new
config etc/tor/tor-tsocks.conf.new
config etc/tor/torrc.new
+