Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 06:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make CLI throw an error if it cannot find tor binary

Browse source
This commit is contained in:
Micah Lee 2020-11-29 11:08:46 -08:00
parent 7bcfe6cad1
commit aecaae896d
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cli/onionshare_cli/__init__.py
View file

@ -22,7 +22,7 @@ import os, sys, time, argparse, threading
from datetime import datetime
from datetime import timedelta
from .common import Common
from .common import Common, CannotFindTor
from .web import Web
from .onion import *
from .onionshare import OnionShare
@ -320,7 +320,15 @@ def main(cwd=None):
web = Web(common, False, mode_settings, mode)
# Start the Onion object
onion = Onion(common, use_tmp_dir=True)
try:
onion = Onion(common, use_tmp_dir=True)
except CannotFindTor:
print("You must install tor to use OnionShare from the command line")
if common.platform == "Darwin":
print("In macOS, you can do this with Homebrew (https://brew.sh):")
print(" brew install tor")
sys.exit()
try:
onion.connect(
custom_settings=False,