From fcdf1470c04b5ef19a7b9d28a48401f4d5c17293 Mon Sep 17 00:00:00 2001 From: Sebastian Hahn 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/TorPreFlight | 51 ------------------------------------------------ 1 file changed, 51 deletions(-) delete mode 100644 contrib/osx/TorPreFlight (limited to 'contrib/osx/TorPreFlight') diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight deleted file mode 100644 index 69dff3c1fd..0000000000 --- a/contrib/osx/TorPreFlight +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# =================================================================== -# -# TorPreFlight is distributed under this license: -# -# Copyright (c) 2006 Andrew Lewman -# Copyright (c) 2008 The Tor Project, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * Neither the names of the copyright owners nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#=============================================================================== - -# TorPreFlight is invoked before the install begins - -# Figure out where Tor is installed -if [ -f /Library/StartupItems/Tor/Tor.loc ]; then - TORPATH=`cat /Library/StartupItems/Tor/Tor.loc` -else - TORPATH="/Library/Tor/" -fi - -# Backup all of Tor, just in case -if [ -d $TORPATH ]; then - cp $TORPATH/torrc $TORPATH/torrc.installer-saved -fi -- cgit v1.2.3-54-g00ecf