Find tor-binary from PATH or via globbering for it

meejah / txtorcon

Twisted-based asynchronous Tor control protocol implementation. Includes unit-tests, examples, state-tracking code and configuration abstraction.

http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/

MIT License

250 stars 72 forks source link

Find tor-binary from PATH or via globbering for it #40

Closed lukaslueg closed 11 years ago

lukaslueg commented 11 years ago

I've moved the function to utils.py now...

launch_tor() will now work on systems where the tor-binary is somewhere else than /usr/sbin. This includes MacOS, where we look for usual installation paths of the tor browser bundle

meejah commented 11 years ago

Am I reading git correctly that this is the same as your buildtorconnection branch?

lukaslueg commented 11 years ago

I'm sorry? This is :master

meejah commented 11 years ago

I see the pull-request is off your master, but I also see a buildtorconnection branch in your repo that looks like the same diff. But, yes, I can just merge from your master. sorry for the interruption . (Ah, neat, I see you just pulled in my master, thanks!)

lukaslueg commented 11 years ago

Nah, beware that it seems I just blew the Makefile due to a merger conflict