Commit 4d5effba authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

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

BB 44560: Customize env variables for alternate data directories.

In Bug 283779, Mozilla added a couple of environment variables to set
custom app data directories.

In this patch, we replace their MOZ_ prefix to make sure we do not
match any customization users might have done for Firefox, so that we
keep the profiles distinct.
parent 2314fba2

python/mozbuild/mozbuild/mach_commands.py

+4 −4
Original line number Diff line number Diff line
@@ -2618,22 +2618,22 @@ def _run_desktop( 
        if appdata is True:

            appdata = tmpdir



        extra_env["MOZ_APP_DATA"] = os.path.normpath(

        extra_env["BB_APP_DATA"] = os.path.normpath(

            os.path.join(appdata, "AppData", "Roaming")

        )

        command_context.log(

            logging.INFO,

            "run",

            {"app_data": extra_env["MOZ_APP_DATA"]},

            {"app_data": extra_env["BB_APP_DATA"]},

            "Overriding application data directory to {app_data}",

        )

        extra_env["MOZ_LOCAL_APP_DATA"] = os.path.normpath(

        extra_env["BB_LOCAL_APP_DATA"] = os.path.normpath(

            os.path.join(appdata, "Local")

        )

        command_context.log(

            logging.INFO,

            "run",

            {"local_app_data": extra_env["MOZ_LOCAL_APP_DATA"]},

            {"local_app_data": extra_env["BB_LOCAL_APP_DATA"]},

            "Overriding local application data directory to {local_app_data}",

        )

toolkit/xre/nsXREDirProvider.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1397,9 +1397,9 @@ nsresult nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile** aFile) { 


nsresult nsXREDirProvider::GetUserDataDirectory(nsIFile** aFile, bool aLocal) {

  nsCOMPtr<nsIFile> localDir;

  nsCOMPtr<nsIFile> customDir = mozilla::GetFileFromEnv("MOZ_APP_DATA");

  nsCOMPtr<nsIFile> customDir = mozilla::GetFileFromEnv("BB_APP_DATA");

  nsCOMPtr<nsIFile> customLocalDir =

      mozilla::GetFileFromEnv("MOZ_LOCAL_APP_DATA");

      mozilla::GetFileFromEnv("BB_LOCAL_APP_DATA");



  if (aLocal && gDataDirProfileLocal) {

    return gDataDirProfileLocal->Clone(aFile);