[tor-commits] [flashproxy/master] Save bin/obfsproxy as obfsproxy.bin in macosx and gnulinux bundles.

[dcf at torproject.org]

commit d1fb9271c7d500add09bd4164293140c9b584284
Author: David Fifield <david at bamsoftware.com>
Date:   Thu May 30 09:35:45 2013 -0700

    Save bin/obfsproxy as obfsproxy.bin in macosx and gnulinux bundles.
    
    This is to avoid a name conflict with the obfsproxy module. See #8944.
---
 doc/Makefile              |    6 ++++--
 doc/bundle-torrc-gnulinux |    2 +-
 doc/bundle-torrc-macosx   |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 85800a1..df62882 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -110,7 +110,8 @@ $(PT_BUNDLE_MACOSX_I686):
 	cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS
 	mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy
 	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy
-	cp -r "$(OBFSPROXY_DIST)"/{obfsproxy,bin/obfsproxy} "$(TBBDIR)"/Contents/MacOs
+	cp -r "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/Contents/MacOs
+	cp -r "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin
 	cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS
 	cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS
 	mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy
@@ -138,7 +139,8 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64):
 	cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App
 	mkdir -p "$(TBBDIR)"/Docs/FlashProxy
 	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy
-	cp -rL "$(OBFSPROXY_DIST)"/{obfsproxy,bin/obfsproxy} "$(TBBDIR)"/App
+	cp -rL "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/App
+	cp -rL "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/App/obfsproxy.bin
 	cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App
 	cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App
 	cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App
diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux
index 3dc7b16..fac4cb5 100644
--- a/doc/bundle-torrc-gnulinux
+++ b/doc/bundle-torrc-gnulinux
@@ -23,4 +23,4 @@ CircuitBuildTimeout 60
 # receive connections from the Internet (the port for which you
 # configured port forwarding).
 ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000
-ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed
+ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.bin managed
diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx
index 4624f68..73e2866 100644
--- a/doc/bundle-torrc-macosx
+++ b/doc/bundle-torrc-macosx
@@ -23,4 +23,4 @@ CircuitBuildTimeout 60
 # receive connections from the Internet (the port for which you
 # configured port forwarding).
 ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000
-ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed
+ClientTransportPlugin obfs2,obfs3 exec obfsproxy.bin managed