fixes #58, at least for TBB 3.0+

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 8e730b2408a6bae87836d88db39802d94d5f892b..03f15b1ef4ca145d6f4c0b91dbc4fad4c9dbed67 100755 (executable)
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -199,6 +199,7 @@ class TBLCommon:
                         'vidalia_bin': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia',
                         'firefox_bin': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox',
                         'firefox_profile': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile',
+                        'versions': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/sources/versions',
                     },
                     'alpha': {
                         'dir': tbb_data+'/tbb/alpha/'+self.architecture,
@@ -206,6 +207,7 @@ class TBLCommon:
                         'vidalia_bin': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia',
                         'firefox_bin': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox',
                         'firefox_profile': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile',
+                        'versions': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/sources/versions',
                     }
                 }
             }
@@ -601,6 +603,14 @@ class TBLLauncher:
         latest_version = self.common.settings['latest_version'][self.common.settings['preferred']]
         installed_version = self.common.settings['installed_version'][self.common.settings['preferred']]
 
+        # verify installed version for newer versions of TBB (#58)
+        if installed_version >= '3.0':
+            versions_filename = self.common.paths['tbb'][self.common.settings['preferred']]['versions']
+            if os.path.exists(versions_filename):
+                for line in open(versions_filename):
+                    if 'TORBROWSER_VERSION' in line:
+                        installed_version = line.lstrip('TORBROWSER_VERSION=').strip()
+
         start = self.common.paths['tbb'][self.common.settings['preferred']]['start']
         if os.path.isfile(start) and os.access(start, os.X_OK):
             if installed_version == latest_version: