From 26356d40706f4a3a032e6994cb6663686568334d Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 20 Oct 2019 00:41:14 -0400 Subject: Fix ProfileMigrator’s file extension, re-enable onboarding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makeicecat | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'makeicecat') diff --git a/makeicecat b/makeicecat index 25dde1c..08a8fb8 100644 --- a/makeicecat +++ b/makeicecat @@ -343,8 +343,8 @@ sed "/MOZILLA_UAVERSION/ s:IceCat/:Firefox/:" -i netwerk/protocol/http/nsHttpHan find . -name region.properties |xargs -i /bin/sed 's_https://www.mibbit.*__' -i {} # Set migrator scripts -cp browser/components/migration/IceCatProfileMigrator.js browser/components/migration/FirefoxProfileMigrator.js -sed 's/IceCat/Firefox/g; s/icecat/firefox/g' -i browser/components/migration/FirefoxProfileMigrator.js +cp browser/components/migration/IceCatProfileMigrator.jsm browser/components/migration/FirefoxProfileMigrator.jsm +sed 's/IceCat/Firefox/g; s/icecat/firefox/g' -i browser/components/migration/FirefoxProfileMigrator.jsm # Copy js settings cat $DATA/settings.js >> browser/app/profile/icecat.js @@ -576,13 +576,14 @@ find extensions/gnu/ | sed s=extensions/gnu=browser/extensions= >> ./browser/ins find extensions/gnu/ | sed s=extensions/gnu=distribution/extensions= >> mobile/android/installer/allowed-dupes.mn # Onboarding -#cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding -#cp $DATA/onboarding/onboarding.js browser/extensions/onboarding/content -#cp $DATA/onboarding/onboarding.properties browser/extensions/onboarding/locales/en-US -#for locale in $(ls -1 $DATA/onboarding/locales/); do -# mkdir -p l10n/$locale/browser/extensions/onboarding || true -# cp $DATA/onboarding/locales/$locale/onboarding.properties l10n/$locale/browser/extensions/onboarding -#done +mkdir -p browser/extensions/onboarding browser/extensions/onboarding/content browser/extensions/onboarding/locales/en-US +cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding +cp $DATA/onboarding/onboarding.js browser/extensions/onboarding/content +cp $DATA/onboarding/onboarding.properties browser/extensions/onboarding/locales/en-US +for locale in $(ls -1 $DATA/onboarding/locales/); do + mkdir -p l10n/$locale/browser/extensions/onboarding || true + cp $DATA/onboarding/locales/$locale/onboarding.properties l10n/$locale/browser/extensions/onboarding +done # Fix CVE-2009-4029 sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in -- cgit v1.2.3