[tor-commits] [tor-browser-build/master] fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60

[gk at torproject.org]

commit c21b1a526ac1e199990496c234532ed309b6209e
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Jun 23 10:46:30 2018 +0000

    fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
    
    There is no `extension-overrides.js` in a profile direcory anymore.
---
 projects/tor-browser/build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 4068eae..0c3e583 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -90,8 +90,6 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files
   mkdir -p $SKELETON_TMP_RESOURCES/browser
   echo "[XRE]" > $SKELETON_TMP_RESOURCES/browser/override.ini
   echo "EnableProfileMigrator=0" >> $SKELETON_TMP_RESOURCES/browser/override.ini
-  mkdir -p $SKELETON_TMP_RESOURCES/distribution/preferences
-  cp -p Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js $SKELETON_TMP_RESOURCES/distribution/preferences
   mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor
   cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/
   # Place a copy of the bookmarks.html file at the top. It will be moved into