diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-06-25 04:03:45 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-06-25 04:03:45 +0000 |
| commit | dcad907ce384da80e4febc47b249eb619287b790 (patch) | |
| tree | d663af890011e375e36dd486d980064187dd0df8 | |
| parent | c75412f595665c10777d83b8ef97fd8a46f2a9fb (diff) | |
| download | tor-dcad907ce384da80e4febc47b249eb619287b790.tar.gz tor-dcad907ce384da80e4febc47b249eb619287b790.zip | |
Backport OSX binary un-installer and perm change.
svn:r6687
| -rw-r--r-- | contrib/osx/TorPostflight | 7 | ||||
| -rw-r--r-- | contrib/osx/package.sh | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index d1efd726cc..21beb97aa3 100644 --- a/contrib/osx/TorPostflight +++ b/contrib/osx/TorPostflight @@ -14,6 +14,11 @@ TARGET=$2/Library/Tor TORDIR=$TARGET/var/lib/tor LOGDIR=$TARGET/var/log/tor +# Check defaults for TARGET +if [ "$TARGET" == "//Library/Tor" ]; then + TARGET=/Library/Tor +fi + # Create user $TORUSER in group daemon. If it's already there, great. $ADDSYSUSER $TORUSER "Tor System user" $TORDIR @@ -75,7 +80,9 @@ fi # Copy Uninstaller if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript + cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller_bin.app $TARGET/Tor_Uninstaller_bin.app chmod 755 $TARGET/Tor_Uninstaller.applescript + chmod 755 $TARGET/Tor_Uninstaller_bin.app fi if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh index 989c8f320e..6cb5e0e069 100644 --- a/contrib/osx/package.sh +++ b/contrib/osx/package.sh @@ -78,6 +78,7 @@ chmod 755 contrib/osx/TorPostflight cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser cp contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/Tor_Uninstaller.applescript +cp contrib/osx/Tor_Uninstaller_bin.app $BUILD_DIR/tor_resources/Tor_Uninstaller_bin.app cp contrib/osx/uninstall_tor_bundle.sh $BUILD_DIR/tor_resources/uninstall_tor_bundle.sh cp contrib/osx/package_list.txt $BUILD_DIR/tor_resources/package_list.txt cp contrib/osx/tor_logo.gif $BUILD_DIR/tor_resources/background.gif @@ -93,10 +94,10 @@ EOF DOC=$BUILD_DIR/tor_resources/documents mkdir $DOC mkdir $DOC/howto -cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto -cp doc/website/tor-doc-server.html.* $DOC/howto -cp doc/website/tor-hidden-service.html.* $DOC/howto -cp doc/website/tor-switchproxy.html.* $DOC/howto +#cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto +#cp doc/website/tor-doc-server.html.* $DOC/howto +#cp doc/website/tor-hidden-service.html.* $DOC/howto +#cp doc/website/tor-switchproxy.html.* $DOC/howto #mkdir $DOC/img #cp doc/img/screenshot-osx* $DOC/img cp AUTHORS $DOC/AUTHORS.txt |