From fcdf1470c04b5ef19a7b9d28a48401f4d5c17293 Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Mon, 11 Oct 2010 18:47:14 +0200
Subject: Remove everything related to os x expert package
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.
The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
---
contrib/osx/Tor | 87 ---------------------------------------------------------
1 file changed, 87 deletions(-)
delete mode 100755 contrib/osx/Tor
(limited to 'contrib/osx/Tor')
diff --git a/contrib/osx/Tor b/contrib/osx/Tor
deleted file mode 100755
index bcddc0c42..000000000
--- a/contrib/osx/Tor
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-TORLOC=/Library/StartupItems/Tor/Tor.loc
-
-if [ -f $TORLOC ]; then
- TORDIR=`cat /Library/StartupItems/Tor/Tor.loc`
- if [ "x$TORDIR" = "x" -o ! -d $TORDIR -o ! -x $TORDIR/tor ]; then
- TORDIR=/Library/Tor
- fi
-else
- TORDIR=/Library/Tor
-fi
-TORCONF=$TORDIR/torrc
-TORDATA=$TORDIR/var/lib/tor
-TORPID=/var/run/Tor.pid
-TORUSER=_tor
-TORGROUP=daemon
-TORCMD=$TORDIR/tor
-TORLOG=/var/log/tor.log
-
-## Determine OSX Version
-# map version to name
-if [ -x /usr/bin/sw_vers ]; then
-# This is poor, yet functional. We don't care about the 3rd number in
-# the OS version
- OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
- case "$OSVER" in
- "10.6") ARCH="i386";;
- "10.5") ARCH="i386";;
- "10.4") ARCH="i386";;
- "10.3") ARCH="ppc";;
- "10.2") ARCH="ppc";;
- "10.1") ARCH="ppc";;
- "10.0") ARCH="ppc";;
- esac
-else
- ARCH="unknown"
-fi
-
-if [ $ARCH != "i386" ]; then
- export EVENT_NOKQUEUE=1
-fi
-
-##
-# Tor Service
-##
-
-. /etc/rc.common
-
-StartService ()
-{
-
- if [ -f $TORCMD ]; then
- if pid=$(GetPID Tor); then
- return 0
- else
- ConsoleMessage "Starting Tor Service"
-# Tentative
-# Making sure it is not running (I know it is not a best approarch)
- killall tor 2>/dev/null
- $TORCMD -f "$TORCONF" --runasdaemon 1 --pidfile "$TORPID" --datadirectory "$TORDATA" --user "$TORUSER" --group "$TORGROUP" --log "notice file $TORLOG" &
- fi
- fi
-}
-
-StopService ()
-{
- if pid=$(GetPID Tor); then
- ConsoleMessage "Stopping Tor Service"
- kill -TERM "${pid}"
-# Just for sanity (sometimes necessary.)
- killall tor 2>/dev/null
- else
- ConsoleMessage "Tor Service not responding."
-# Just for sanity (sometimes necessary.)
- killall tor 2>/dev/null
- fi
-}
-
-RestartService () { StopService; StartService; }
-
-if [ "$#" = 0 ]; then
- echo "Syntax: tor {start|stop}"
- exit 1
-fi
-
-RunService "$1"
--
cgit v1.2.3