Fail to launch Tor Browser if its version is earlier than the minimum version (#224)

[torbrowser-launcher.git] / setup.py

diff --git a/setup.py b/setup.py
index ae0ae5c6fa45f12bdaada2828683b553dba7bc0c..ce7efe2b3557a113da0d1bc85c34cca3aa00c434 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -27,11 +27,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from distutils.core import setup
-import os, sys, subprocess
+import os, sys, platform
 SHARE = 'share'
 
 # detect linux distribution
-distro = subprocess.check_output(['lsb_release', '-i']).split()[-1]
+distro = platform.dist()[0]
 
 def file_list(path):
     files = []
@@ -54,7 +54,6 @@ if distro != 'Ubuntu':
         # we're not in a virtualenv, so we can probably write to /etc
         datafiles += [('/etc/apparmor.d/', [
             'apparmor/torbrowser.Browser.firefox',
-            'apparmor/torbrowser.start-tor-browser',
             'apparmor/torbrowser.Tor.tor',
             'apparmor/usr.bin.torbrowser-launcher'])]
 
@@ -66,13 +65,9 @@ setup(
     url='https://www.github.com/micahflee/torbrowser-launcher',
     platforms=['GNU/Linux'],
     license='MIT',
-    description='A program to help you download, keep updated, and run the Tor Browser Bundle',
+    description='A program to help you securely download and run Tor Browser',
     long_description="""
-Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles downloading the most recent version of TBB for you, in your language and for your architecture. It also adds a "Tor Browser" application launcher to your operating system's menu.
-
-When you first launch Tor Browser Launcher, it will download TBB from https://www.torproject.org/ and extract it in ~/.torproject, and then execute it. When you run it after that it will just execute TBB.
-
-Tor Browser Launcher will get updated each time a new version of TBB is released. When you open Tor Browser after an update, it will download the newer version of TBB for you and extract it over your old TBB directory in ~/.torproject, so you will maintain your TBB bookmarks.
+Tor Browser Launcher is intended to make Tor Browser easier to install and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles downloading the most recent version of Tor Browser for you, in your language and for your architecture. It also adds a "Tor Browser" application launcher to your operating system's menu. When you first launch Tor Browser Launcher, it will download Tor Browser from https://www.torproject.org/, extract it in your home directory, and execute it. When you run it after that it will just launch Tor Browser.
 """,
     packages=['torbrowser_launcher'],
     scripts=['torbrowser-launcher'],