[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Mac packaging magic: make man pages useable, and do not ove...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] Mac packaging magic: make man pages useable, and do not ove...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Fri, 18 Mar 2005 15:59:17 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 18 Mar 2005 15:59:38 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor/contrib/osx
In directory moria.mit.edu:/tmp/cvs-serv25739/contrib/osx
Modified Files:
TorPostflight package.sh
Log Message:
Mac packaging magic: make man pages useable, and do not overwrite existing torrc files.
Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TorPostflight 5 Jan 2005 02:46:25 -0000 1.2
+++ TorPostflight 18 Mar 2005 20:59:14 -0000 1.3
@@ -10,7 +10,8 @@
TORUSER=_tor
TORGROUP=daemon
-TORDIR=/Library/Tor/var/lib/tor
+TARGET=$2/Library/Tor
+TORDIR=$TARGET/var/lib/tor
# Create user $TORUSER in group daemon. If it's already there, great.
$ADDSYSUSER $TORUSER "Tor System user" $TORDIR
@@ -24,7 +25,12 @@
chgrp daemon $TORDIR
chmod 700 $TORDIR
-# Ensure a symbolic link.
+# Create the configuration file only if there wan't one already.
+if [ ! -f $TARGET/torrc ]; then
+ cp $TARGET/torrc.sample $TARGET/torrc
+fi
+
+# Ensure symbolic links
cd /usr/bin
if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then
mv tor tor_old
@@ -32,5 +38,9 @@
if [ -e /usr/bin/tor-resolve -a ! -L /usr/bin/tor-resolve ]; then
mv tor-resolve tor-resolve_old
fi
-ln -sf /Library/Tor/tor .
-ln -sf /Library/Tor/tor_resolve .
+ln -sf $TARGET/tor .
+ln -sf $TARGET/tor_resolve .
+
+cd /usr/share/man/man1
+MAN1=$TARGET/man/man1
+ln -sf $MAN1/*.1 .
Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.sh 5 Jan 2005 02:46:25 -0000 1.2
+++ package.sh 18 Mar 2005 20:59:14 -0000 1.3
@@ -48,7 +48,7 @@
### Make Tor package.
make install DESTDIR=$BUILD_DIR/tor_packageroot
-mv $BUILD_DIR/tor_packageroot/Library/Tor/torrc.sample $BUILD_DIR/tor_packageroot/Library/Tor/torrc
+#mv $BUILD_DIR/tor_packageroot/Library/Tor/torrc.sample $BUILD_DIR/tor_packageroot/Library/Tor/torrc
cp contrib/osx/ReadMe.rtf $BUILD_DIR/tor_resources
#cp contrib/osx/License.rtf $BUILD_DIR/tor_resources
cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight