[Pkg-anonymity-tools] [torbrowser-launcher] 02/43: make SHARE point at TBL's share directory

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository torbrowser-launcher.

commit 492a699c1d03c151058ab899a22bf0f68bc06908
Author: Leif Ryge <leif at synthesize.us>
Date:   Mon Aug 11 03:42:32 2014 +0000

    make SHARE point at TBL's share directory
    
    also stop using /usr/local/share/torbrowser-launcher/mirrors.txt as a secondary
    mirrors list, and start including one from the config directory instead.
---
 torbrowser-launcher | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 066e554..40087d2 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -29,12 +29,12 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 import os
 import sys
-SHARE = os.getenv('TBL_SHARE', sys.prefix+'/share')
+SHARE = os.getenv('TBL_SHARE', sys.prefix+'/share/torbrowser-launcher')
 
 import platform
 
 import gettext
-gettext.install('torbrowser-launcher', os.path.join(SHARE, 'torbrowser-launcher/locale'))
+gettext.install('torbrowser-launcher', os.path.join(SHARE, 'locale'))
 
 from twisted.internet import gtk2reactor
 gtk2reactor.install()
@@ -174,12 +174,12 @@ class TBLCommon:
                 },
                 'old_data_dir': old_tbb_data,
                 'tbl_bin': '/usr/bin/torbrowser-launcher',
-                'icon_file': os.path.join(SHARE, 'pixmaps/torbrowser80.xpm'),
-                'torproject_pem': os.path.join(SHARE, 'torbrowser-launcher/torproject.pem'),
-                'erinn_key': os.path.join(SHARE, 'torbrowser-launcher/erinn.asc'),
-                'mirrors_txt': [os.path.join(SHARE, 'torbrowser-launcher/mirrors.txt'),
-                                '/usr/local/share/torbrowser-launcher/mirrors.txt'],
-                'modem_sound': os.path.join(SHARE, 'torbrowser-launcher/modem.ogg'),
+                'icon_file': os.path.join(os.path.dirname(SHARE), 'pixmaps/torbrowser80.xpm'),
+                'torproject_pem': os.path.join(SHARE, 'torproject.pem'),
+                'erinn_key': os.path.join(SHARE, 'erinn.asc'),
+                'mirrors_txt': [os.path.join(SHARE, 'mirrors.txt'),
+                                tbb_config+'/mirrors.txt'],
+                'modem_sound': os.path.join(SHARE, 'modem.ogg'),
                 'download_dir': tbb_cache+'/download',
                 'gnupg_homedir': tbb_local+'/gnupg_homedir',
                 'settings_file': tbb_config+'/settings',
@@ -1113,7 +1113,7 @@ class TBLLauncher:
             reactor.stop()
 
 if __name__ == "__main__":
-    with open(os.path.join(SHARE, 'torbrowser-launcher/version')) as buf:
+    with open(os.path.join(SHARE, 'version')) as buf:
         tor_browser_launcher_version = buf.read().strip()
 
     print _('Tor Browser Launcher')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git