Commit 0507ba11 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 42438: Tweaks to the migration wizard. 

Remove the items not compatible with our features (such as history) from
the migration wizard.

On Linux, allow to specify an alternative home directory, since we
usually change $HOME in our startup script.
parent 50f85eb8

browser/components/migration/ChromeMigrationUtils.sys.mjs

+4 −1
Original line number Diff line number Diff line
@@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { 
    for (let subfolders of options) {

      let rootDir = subfolders[0];

      try {

        let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path;

        let targetPath =

          rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME")

            ? Services.env.get("BB_ORIGINAL_HOME")

            : Services.dirsvc.get(rootDir, Ci.nsIFile).path;

        targetPath = PathUtils.join(targetPath, ...subfolders.slice(1));

        if (await IOUtils.exists(targetPath)) {

          return targetPath;

browser/components/migration/content/migration-wizard.mjs

+4 −1
Original line number Diff line number Diff line
@@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { 
    }



    let key = panelItem.getAttribute("key");

    let resourceTypes = panelItem.resourceTypes;

    const allowedTypes = ["BOOKMARKS"];

    let resourceTypes = panelItem.resourceTypes.filter(t =>

      allowedTypes.includes(t)

    );



    for (let child of this.#resourceTypeList.querySelectorAll(

      "label[data-resource-type]"