Merge branch 'master' of https://github.com/micahflee/onionshare

BUILD.md

@@ -27,7 +27,7 @@ After that you can try both the CLI and the GUI version of OnionShare:
 A script to build a .deb package and install OnionShare easily is also provided for your convenience:
 
 ```sh
-sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb dh-python python-nautilus
+sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb dh-python python-nautilus python3-nose
 ./install/build_deb.sh
 sudo dpkg -i deb_dist/onionshare_*.deb
 ```

CHANGELOG.md

@@ -1,5 +1,10 @@
 # OnionShare Changelog
 
+## 0.9.2 (Linux only)
+
+* Looks for `TOR_CONTROL_PORT` environment variable, to help Tails integration
+* Change how OnionShare checks to see if it's installed system-wide, to help Subgraph OS integration
+
 ## 0.9.1
 
 * Added Nautilus extension, so you can right-click on a file and choose "Share via OnionShare", thanks to Subgraph developers

onionshare/helpers.py

@@ -34,7 +34,7 @@ def get_resource_path(filename):
     systemwide, and whether regardless of platform
     """
     p = get_platform()
-    if p == 'Linux' and sys.argv and sys.argv[0].startswith('/usr/bin/onionshare'):
+    if p == 'Linux' and sys.argv and sys.argv[0].startswith(sys.prefix):
         # OnionShare is installed systemwide in Linux
         resources_dir = os.path.join(sys.prefix, 'share/onionshare')
     elif getattr(sys, 'frozen', False): # Check if app is "frozen" with cx_Freeze

onionshare/onion.py

@@ -57,7 +57,11 @@ class Onion(object):
         # connect to the tor controlport
         found_tor = False
         self.c = None
-        ports = [9151, 9153, 9051]
+        env_port = os.environ.get('TOR_CONTROL_PORT')
+        if env_port:
+            ports = [int(env_port)]
+        else:
+            ports = [9151, 9153, 9051]
         for port in ports:
             try:
                 self.c = Controller.from_port(port=port)

resources/version.txt

@@ -1 +1 @@
-0.9.1
+0.9.2