Remove extra print statement

[torbrowser-launcher.git] / setup.py

diff --git a/setup.py b/setup.py
index 21e39fa0f39476ae9127bfbf9bf905ad70f2b4bb..37452ba06fcef82a943a81bdd162a874cdacbcd8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -26,13 +26,18 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
+import os
+import sys
+import platform
+import subprocess
 from distutils.core import setup
-import os, sys, platform
+
 SHARE = 'share'
 
 # detect linux distribution
 distro = platform.dist()[0]
 
+
 def file_list(path):
     files = []
     for filename in os.listdir(path):
@@ -40,6 +45,27 @@ def file_list(path):
             files.append(path+'/'+filename)
     return files
 
+
+def create_mo_files():
+    po_dir = 'po/'
+    if not os.path.exists(po_dir):
+        return []
+    domain = 'torbrowser-launcher'
+    mo_files = []
+    po_files = [f
+                for f in next(os.walk(po_dir))[2]
+                if os.path.splitext(f)[1] == '.po']
+    for po_file in po_files:
+        filename, extension = os.path.splitext(po_file)
+        mo_file = domain + '.mo'
+        mo_dir = 'share/locale/' + filename + '/LC_MESSAGES/'
+        subprocess.call('mkdir -p ' + mo_dir, shell=True)
+        msgfmt_cmd = 'msgfmt {} -o {}'.format(po_dir + po_file, mo_dir + mo_file)
+        subprocess.call(msgfmt_cmd, shell=True)
+        mo_files.append(mo_dir + mo_file)
+    return mo_files
+
+
 with open(os.path.join(SHARE, 'torbrowser-launcher/version')) as buf:
     version = buf.read().strip()
 
@@ -52,10 +78,19 @@ for root, dirs, files in os.walk(SHARE):
 if distro != 'Ubuntu':
     if not hasattr(sys, 'real_prefix'):
         # we're not in a virtualenv, so we can probably write to /etc
-        datafiles += [('/etc/apparmor.d/', [
-            'apparmor/torbrowser.Browser.firefox',
-            'apparmor/torbrowser.Tor.tor',
-            'apparmor/usr.bin.torbrowser-launcher'])]
+        datafiles += [
+            ('/etc/apparmor.d/', [
+                'apparmor/torbrowser.Browser.firefox',
+                'apparmor/torbrowser.Browser.plugin-container',
+                'apparmor/torbrowser.Tor.tor']),
+            ('/etc/apparmor.d/local/', [
+                'apparmor/local/torbrowser.Browser.firefox',
+                'apparmor/local/torbrowser.Browser.plugin-container',
+                'apparmor/local/torbrowser.Tor.tor']),
+            ('/etc/apparmor.d/tunables/', ['apparmor/tunables/torbrowser'])
+        ]
+
+datafiles += [('/usr/share/locale/', create_mo_files())]
 
 setup(
     name='torbrowser-launcher',
@@ -67,7 +102,15 @@ setup(
     license='MIT',
     description='A program to help you securely download and run Tor Browser',
     long_description="""
-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 securely 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/, verify the PGP signature, extract it in your home directory, and launch it. When you run it after that it will just launch Tor Browser.
+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 securely 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/, verify the PGP signature, extract it in your home
+directory, and launch it. When you run it after that it will just launch Tor
+Browser.
 """,
     packages=['torbrowser_launcher'],
     scripts=['torbrowser-launcher'],