GitLab

at 2024-02-07T16:38:26+01:00

fixup! Bug 9173: Change the default Firefox profile directory to be relative.

Add a method to query whether the browser is in portable mode.

fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Allow running the postupdate process and change the update directory
for when not running in portable mode.

 #endif

   if (argc > callbackIndex) {

-#if defined(XP_WIN) && !defined(BASE_BROWSER_UPDATE)

+#if defined(XP_WIN)

     if (gSucceeded) {

       if (!LaunchWinPostProcess(gInstallDirPath, gPatchDirPath)) {

         fprintf(stderr, "The post update process was not launched");

    * Gets the hash for the current installation directory.

    */

   AString getInstallHash();

+

+  /**

+   * Tells whether the browser has been started in portable mode.

+   */

+  readonly attribute bool isPortableMode;

 };
   rv = GetUserDataDirectory(getter_AddRefs(updRoot), false);

   NS_ENSURE_SUCCESS(rv, rv);

 #  else

-  rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false);

+  bool isPortable = true;

+  rv = GetIsPortableMode(&isPortable);

+  NS_ENSURE_SUCCESS(rv, rv);

+  if (isPortable) {

+    rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false);

+  } else {

+    rv = GetUserDataDirectory(getter_AddRefs(updRoot), true);

+  }

   NS_ENSURE_SUCCESS(rv, rv);

 #  endif

   rv = updRoot->AppendNative("UpdateInfo"_ns);

 }

 #endif

+NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) {

+#ifdef RELATIVE_DATA_DIR

+  if (gDataDirPortable) {

+    *aIsPortableMode = *gDataDirPortable;

+  } else {

+    nsCOMPtr<nsIFile> dir;

+    GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode);

+  }

+#else

+  *aIsPortableMode = false;

+#endif

+  return NS_OK;

+}

+

 nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,

                                                     bool aLocal) {

   // Copied from nsAppFileLocationProvider (more or less)

Pier Angelo Vendrame pushed to branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes: