diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
| commit | 2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd (patch) | |
| tree | d6786b027903624576e2f8861a68e665d0fbbb9b /contrib/osx/TorPreFlight | |
| parent | a29596556c60fbbf687b1af48b9e6646b25f208e (diff) | |
| parent | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (diff) | |
| download | tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar.gz tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to 'contrib/osx/TorPreFlight')
| -rw-r--r-- | contrib/osx/TorPreFlight | 51 |
1 files changed, 0 insertions, 51 deletions
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 |