Fixes #415 and #284 #416
Fixes #415 and #284 #416
Conversation
In your common class the methods build_paths() and load_settings() are very intertwined. This results in the force_en-US setting to be ignored after extraction making it stuck on "Installing". This approach reload the paths if this setting is found. I'm not really happy with how the fix works but it does. Hope it helps!
|
Any chance of reviewing this? Thanks @micahflee |
|
This PR needs a rebase because https://github.com/micahflee/torbrowser-launcher/pull/526/files changed a bunch of quotes from single- to double-quotes. |
| @@ -300,6 +296,11 @@ def load_settings(self): | |||
| if settings['tbl_version'] != self.tbl_version: | |||
| settings['tbl_version'] = self.tbl_version | |||
| resave = True | |||
|
|
|||
| # we need to update paths if force english is set | |||
There was a problem hiding this comment.
This needs to be moved before settings['installed'] = os.path.isfile(self.paths['tbb']['start']) a few lines above.
Otherwise the new path isn't used for the check. In my case, this results in TBB being downloaded and installed every time I run the launcher. The launcher finds that ~/.local/share/torbrowser/tbb/x86_64/tor-browser_de/start-tor-browser.desktop is not present but then installs /home/tim/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/start-tor-browser.desktop...
|
This PR got superseded by #585 |
In your common class the methods build_paths() and load_settings() are very intertwined.
This results in the force_en-US setting to be ignored after extraction making it stuck on "Installing".
This approach reload the paths if this setting is found.
I'm not really happy with how the fix works but it does.
Hope it helps!
This should fix #415 and fix #284.