diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-03-18 20:59:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-03-18 20:59:14 +0000 |
| commit | 4b400312de504885f722e5f726ce10527c43da1d (patch) | |
| tree | e60e4512f6e6ee67a7d6e585332d9e8119a0f009 | |
| parent | 7c29b65466ca0a6c4e4e43130815b3fcfb8cb718 (diff) | |
| download | tor-4b400312de504885f722e5f726ce10527c43da1d.tar.gz tor-4b400312de504885f722e5f726ce10527c43da1d.zip | |
Mac packaging magic: make man pages useable, and do not overwrite existing torrc files.
svn:r3774
| -rw-r--r-- | contrib/osx/TorPostflight | 18 | ||||
| -rw-r--r-- | contrib/osx/package.sh | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index 1a46fcd0f1..8919f376c9 100644 --- a/contrib/osx/TorPostflight +++ b/contrib/osx/TorPostflight @@ -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 . diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh index 0a2976226c..afb7268566 100644 --- a/contrib/osx/package.sh +++ b/contrib/osx/package.sh @@ -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 |