boklm pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits:

• 5898a9ab
  by Nicolas Vigier at 2024-01-25T10:21:48+01:00

  fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
  
  Bug 42293: Don't disable updater when run by torbrowser-launcher flatpak
  
  When the TORBROWSER_LAUNCHER environment variable is set (which
  is set by torbrowser-launcher since version 0.3.7) we assume that Tor
  Browser is not installed by a Flatkpak. Although torbrowser-launcher
  itself can be installed by a Flatpak, this should not prevent the
  updater from working.
  

1 changed file:

• widget/gtk/WidgetUtilsGtk.cpp

Changes:

 bool IsRunningUnderSnap() { return !!GetSnapInstanceName(); }

 bool IsRunningUnderFlatpak() {

+  // tor-browser#42293: Don't disable updater when run by torbrowser-launcher flatpak

+  const char* torbrowserLauncher = g_getenv("TORBROWSER_LAUNCHER");

+  if (torbrowserLauncher) {

+    return false;

+  }

   // https://gitlab.gnome.org/GNOME/gtk/-/blob/4300a5c609306ce77cbc8a3580c19201dccd8d13/gdk/gdk.c#L472

   static bool sRunning = [] {

     return g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS);