mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Mac packaging magic: make man pages useable, and do not overwrite existing torrc files.

Browse Source 
svn:r3774
This commit is contained in:
Nick Mathewson 2005-03-18 20:59:14 +00:00
parent 7c29b65466
commit 4b400312de
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/osx/TorPostflight
View File

@ -10,7 +10,8 @@ fi
TORUSER=_tor TORUSER=_tor
TORGROUP=daemon 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. # Create user $TORUSER in group daemon. If it's already there, great.
$ADDSYSUSER $TORUSER "Tor System user" $TORDIR $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
@ -24,7 +25,12 @@ chown $TORUSER $TORDIR
chgrp daemon $TORDIR chgrp daemon $TORDIR
chmod 700 $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 cd /usr/bin
if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then
mv tor tor_old mv tor tor_old
@ -32,5 +38,9 @@ fi
if [ -e /usr/bin/tor-resolve -a ! -L /usr/bin/tor-resolve ]; then if [ -e /usr/bin/tor-resolve -a ! -L /usr/bin/tor-resolve ]; then
mv tor-resolve tor-resolve_old mv tor-resolve tor-resolve_old
fi fi
ln -sf /Library/Tor/tor . ln -sf $TARGET/tor .
ln -sf /Library/Tor/tor_resolve . ln -sf $TARGET/tor_resolve .
cd /usr/share/man/man1
MAN1=$TARGET/man/man1
ln -sf $MAN1/*.1 .

2
contrib/osx/package.sh
View File

@ -48,7 +48,7 @@ done
### Make Tor package. ### Make Tor package.
make install DESTDIR=$BUILD_DIR/tor_packageroot 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/ReadMe.rtf $BUILD_DIR/tor_resources
#cp contrib/osx/License.rtf $BUILD_DIR/tor_resources #cp contrib/osx/License.rtf $BUILD_DIR/tor_resources
cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight