THIS gets the thin copy actually working

1 files changed, 29 insertions, 7 deletions

diff --git a/firefox-sideloader/functions.sh b/firefox-sideloader/functions.sh
index b1208ee..62a8624 100644
--- a/firefox-sideloader/functions.sh
+++ b/firefox-sideloader/functions.sh
@@ -71,6 +71,34 @@ copy_file_with_filter()
     esac
 }
 
+keep_prefs()
+{
+    (xargs printf %s | tr -d ' ') <<'EOF'
+browser.newtab.extensionControlled |
+browser.newtab.privateAllowed |
+browser.reader.detectedFirstArticle |
+browser.rights.3.shown |
+browser.startup.homepage |
+browser.startup.homepage_override.buildID |
+browser.startup.homepage_override.mstone |
+browser.toolbarbuttons.introduced.pocket-button |
+datareporting.policy.dataSubmissionPolicyAcceptedVersion |
+datareporting.policy.dataSubmissionPolicyNotifiedTime |
+extensions.webextensions.uuids
+EOF
+}
+
+prefs()
+{
+    if [ "$COPY_ALL_PREFS" ]
+    then
+        copy_file_with_filter "$new_profile_dir" "$old_profile_dir" 'prefs.js'
+    else
+        egrep "^user_pref.\"($(printf "%s" $(keep_prefs)))\"" "$old_profile_dir"/prefs.js > "$new_profile_dir"/prefs.js
+        printf '%s\n' 'user_pref("browser.startup.homepage_override.mstone", "ignore");' >> "$new_profile_dir"/prefs.js
+    fi
+}
+
 clone_profile_raw()
 {
     local old_profile_dir="$1" new_profile_name="$2"
@@ -87,13 +115,7 @@ clone_profile_raw()
     copy_file_with_filter "$new_profile_dir" "$old_profile_dir" 'extensions.json'
     copy_file_with_filter "$new_profile_dir" "$old_profile_dir" 'addonStartup.json.lz4'
 
-    if [ "$COPY_ALL_PREFS" ]
-    then
-        copy_file_with_filter "$new_profile_dir" "$old_profile_dir" 'prefs.js'
-    else
-        egrep '^user_pref."(browser.startup.homepage"|app.normandy\.|browser.newtab\.|extensions\.|doh-rollout\.)' "$old_profile_dir"/prefs.js > "$new_profile_dir"/prefs.js
-        printf '%s\n' 'user_pref("browser.startup.homepage_override.mstone", "ignore");' >> "$new_profile_dir"/prefs.js
-    fi
+    prefs
 }
 
 clone_profile()