[or-cvs] More OS X Packaging work: remove clickthrough license; move...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/contrib/osx
In directory moria.mit.edu:/tmp/cvs-serv27333

Modified Files:
      Tag: tor-0_0_9-patches
	Tor TorPostflight package.sh 
Removed Files:
      Tag: tor-0_0_9-patches
	License.rtf 
Log Message:
More OS X Packaging work: remove clickthrough license; move files to /Library/Tor (and out of /usr/local)

--- License.rtf DELETED ---

Index: Tor
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Attic/Tor,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- Tor	22 Dec 2004 23:37:48 -0000	1.1.2.2
+++ Tor	4 Jan 2005 05:38:59 -0000	1.1.2.3
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-TORCONF=/usr/local/etc/tor/torrc
-TORDIR=/usr/local/var/lib/tor
+TORCONF=/Library/Tor/torrc
+TORDIR=/Library/Tor/var/lib/tor
 TORPID=/var/run/Tor.pid
 TORUSER=_tor
 TORGROUP=daemon
-TORCMD=/usr/local/bin/tor
+TORCMD=/Library/Tor/tor
 
 ##
 # Tor Service

Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Attic/TorPostflight,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- TorPostflight	22 Dec 2004 23:37:48 -0000	1.1.2.1
+++ TorPostflight	4 Jan 2005 05:38:59 -0000	1.1.2.2
@@ -10,7 +10,7 @@
 
 TORUSER=_tor
 TORGROUP=daemon
-TORDIR=/usr/local/var/lib/tor
+TORDIR=/Library/Tor/var/lib/tor
 
 # Create user $TORUSER in group daemon.  If it's already there, great.
 $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
@@ -23,3 +23,14 @@
 chown $TORUSER $TORDIR
 chgrp daemon $TORDIR
 chmod 700 $TORDIR
+
+# Ensure a symbolic link.
+cd /usr/bin
+if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then
+  mv tor tor_old
+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 .

Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Attic/package.sh,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- package.sh	22 Dec 2004 23:37:48 -0000	1.1.2.6
+++ package.sh	4 Jan 2005 05:38:59 -0000	1.1.2.7
@@ -48,9 +48,9 @@
 
 ### Make Tor package.
 make install DESTDIR=$BUILD_DIR/tor_packageroot
-cp $BUILD_DIR/tor_packageroot/usr/local/etc/tor/torrc.sample $BUILD_DIR/tor_packageroot/usr/local/etc/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/License.rtf $BUILD_DIR/tor_resources
 cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
 cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
 cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt
@@ -101,7 +101,7 @@
 mkdir -p "$MPKG/Contents/Resources"
 echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
 cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
-cp contrib/osx/License.rtf "$MPKG/Contents/Resources"
+#cp contrib/osx/License.rtf "$MPKG/Contents/Resources"
 cp contrib/osx/TorBundleInfo.plist "$MPKG/Contents/Info.plist"
 cp contrib/osx/TorBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
 cp contrib/osx/TorBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
@@ -117,7 +117,7 @@
 cp $PRIVOXY_RESDIR/License.html $BUILD_DIR/output/Privoxy\ License.html
 cp $PRIVOXY_RESDIR/ReadMe.txt $BUILD_DIR/output/Privoxy\ ReadMe.txt
 cp contrib/osx/ReadMe.rtf $BUILD_DIR/output/Tor\ ReadMe.rtf
-cp contrib/osx/License.rtf $BUILD_DIR/output/Tor\ License.rtf
+cp LICENSE $BUILD_DIR/output/Tor\ License.txt
 
 ### Assemble documentation