Commit 4b400312 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

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


svn:r3774
parent 7c29b654

contrib/osx/TorPostflight

+14 −4
Changes for contrib/osx/TorPostflight: 14 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ fi 


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 @@ chown $TORUSER $TORDIR 
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 @@ fi 
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 .

contrib/osx/package.sh

+1 −1
Changes for contrib/osx/package.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ done 


### 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