[Pkg-privacy-commits] [torbrowser-launcher] 151/476: work-in-progress on #49

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 0ded510f7c78bf713c11ed965b2702b4e374682e
Author: Micah Lee <micahflee at riseup.net>
Date:   Wed Aug 7 18:15:01 2013 +0200

    work-in-progress on #49
---
 torbrowser-launcher | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 60f3fef..492b466 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -143,13 +143,33 @@ class TBLCommon:
         tbb_data = '%s/.torbrowser' % homedir
 
         if tbb_version:
-            tarball_filename = 'tor-browser-gnu-linux-'+self.architecture+'-'+tbb_version+'-dev-'+self.language+'.tar.gz'
+            if tbb_version >= '3.':
+                # tarball filename
+                dirname = tbb_version.replace('-alpha-', 'a')
+                dirname = tbb_version.replace('-beta-', 'b')
+                if self.architecture == 'x86_64':
+                    arch = 'linux64'
+                else:
+                    arch = 'linux32'
+                tarball_filename = dirname+'/tor-browser-'+arch+'-'+tbb_version+'_'+self.language+'.tar.xz'
+
+                # sig
+                self.paths['sha256_file'] = tbb_data+'/download/sha256sums.txt'
+                self.paths['sha256_sig_file'] = tbb_data+'/download/sha256sums.txt.asc'
+                self.paths['sha256_url'] = 'https://archive.torproject.org/tor-package-archive/torbrowser/'+dirname+'/sha256sums.txt'
+                self.paths['sha256_sig_url'] = 'https://archive.torproject.org/tor-package-archive/torbrowser/'+dirname+'/sha256sums.txt.mp-asc'
+            else:
+                # tarball filename
+                tarball_filename = 'tor-browser-gnu-linux-'+self.architecture+'-'+tbb_version+'-dev-'+self.language+'.tar.gz'
+
+                # sig
+                self.paths['tarball_sig_file'] = tbb_data+'/download/'+tarball_filename+'.asc'
+                self.paths['tarball_sig_url'] = '{0}torbrowser/linux/'+tarball_filename+'.asc'
+                self.paths['tarball_sig_filename'] = tarball_filename+'.asc'
+
             self.paths['tarball_file'] = tbb_data+'/download/'+tarball_filename
-            self.paths['tarball_sig_file'] = tbb_data+'/download/'+tarball_filename+'.asc'
             self.paths['tarball_url'] = '{0}torbrowser/linux/'+tarball_filename # {0} will be replaced with the mirror
-            self.paths['tarball_sig_url'] = '{0}torbrowser/linux/'+tarball_filename+'.asc'
             self.paths['tarball_filename'] = tarball_filename
-            self.paths['tarball_sig_filename'] = tarball_filename+'.asc'
 
         else:
             self.paths = {
@@ -159,6 +179,7 @@ class TBLCommon:
                 'erinn_key': '/usr/share/torbrowser-launcher/erinn.asc',
                 'sebastian_key': '/usr/share/torbrowser-launcher/sebastian.asc',
                 'alexandre_key': '/usr/share/torbrowser-launcher/alexandre.asc',
+                'mike_key': '/usr/share/torbrowser-launcher/mike.asc',
                 'mirrors_txt': '/usr/share/torbrowser-launcher/mirrors.txt',
                 'data_dir': tbb_data,
                 'download_dir': tbb_data+'/download',
@@ -769,14 +790,14 @@ class TBLLauncher:
             print _('Checking to see if update is needed')
             self.attempt_update()
 
-        elif task == 'download_tarball':
-            print _('Downloading'), self.common.paths['tarball_url'].format(self.common.settings['mirror'])
-            self.download('tarball', self.common.paths['tarball_url'], self.common.paths['tarball_file'])
-
         elif task == 'download_tarball_sig':
             print _('Downloading'), self.common.paths['tarball_sig_url'].format(self.common.settings['mirror'])
             self.download('signature', self.common.paths['tarball_sig_url'], self.common.paths['tarball_sig_file'])
 
+        elif task == 'download_tarball':
+            print _('Downloading'), self.common.paths['tarball_url'].format(self.common.settings['mirror'])
+            self.download('tarball', self.common.paths['tarball_url'], self.common.paths['tarball_file'])
+
         elif task == 'verify':
             print _('Verifying signature')
             self.verify()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git