Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 07d2f3f1 by Pier Angelo Vendrame at 2023-04-20T08:58:20+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Bug 41654: Move UpdateInfo into Data again

- - - - - 83901ef7 by Pier Angelo Vendrame at 2023-04-20T08:58:35+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser

Bug 41654: Fix the UpdateInfo directory path

- - - - -

1 changed file:

- toolkit/xre/nsXREDirProvider.cpp

Changes:

===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1213,16 +1213,24 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, NS_ENSURE_SUCCESS(rv, rv);

#if defined(BASE_BROWSER_UPDATE) - nsCOMPtr<nsIFile> dataDir; // For Base Browser and derivatives, we store update history, etc. within the // UpdateInfo directory under the user data directory. # if defined(ANDROID) # error "The Base Browser updater is not supported on Android." -# else +# endif + nsCOMPtr<nsIFile> dataDir; rv = GetUserDataDirectoryHome(getter_AddRefs(dataDir), false); NS_ENSURE_SUCCESS(rv, rv); rv = dataDir->GetParent(getter_AddRefs(updRoot)); NS_ENSURE_SUCCESS(rv, rv); +# if !defined(XP_MACOSX) + // For Tor Browser, the profile directory is TorBrowser/Data/Browser. + // Updates used to be in TorBrowser/updateInfo, so go up two directories. + // If we switch to data directory outside also on Windows and on Linux, we + // should remove this block. + dataDir = updRoot; + rv = dataDir->GetParent(getter_AddRefs(updRoot)); + NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); NS_ENSURE_SUCCESS(rv, rv);

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c24cc05...