From d72103c449e8f87d1e83cf6a8e4884bd4ba75ddf Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Sun, 2 Feb 2014 14:00:18 +0100 Subject: [PATCH] fixed - check it out SuperMario :-) --- CLIENT_DATA/mozilla.cfg | 20 ++++++++++++++----- CLIENT_DATA/mozilla.cfg.xp | 20 ++++++++++++++----- CLIENT_DATA/setup32.ins | 18 ++++++++++++----- ...ictionaries.addons.mozilla.org.xpi.sha1sum | 2 +- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/CLIENT_DATA/mozilla.cfg b/CLIENT_DATA/mozilla.cfg index 59ca2f4..15eba5c 100644 --- a/CLIENT_DATA/mozilla.cfg +++ b/CLIENT_DATA/mozilla.cfg @@ -8,14 +8,24 @@ lockPref("app.update.enabled", false); // stops the 'know your rights' button from displaying on first run pref("browser.rights.3.shown", true); pref("mail.rights.version", 1); -// stops the request to send performance data from displaying -pref("toolkit.telemetry.prompted", true); -// imap folder redirection -pref("mail.root.imap-rel", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); -pref("mail.root.imap", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); +// stops the request to send performance data from displaying +pref("toolkit.telemetry.prompted", 2); +pref("toolkit.telemetry.rejected", true); +pref("toolkit.telemetry.enabled", false); + +// prevent the Migration Assistant and the What's New page from showing after upgrades +pref("mail.ui.show.migration.on.upgrade", false); +pref("app.update.showInstalledUI", false); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("mailnews.start_page_override.mstone", "ignore"); // settings for add-on installations // https://developer.mozilla.org/en-US/docs/Installing_extensions // pref("extensions.autoDisableScopes", 15); // pref("extensions.enabledScopes", 4); + +// imap folder redirection +pref("mail.root.imap-rel", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); +pref("mail.root.imap", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); + diff --git a/CLIENT_DATA/mozilla.cfg.xp b/CLIENT_DATA/mozilla.cfg.xp index db6daa1..77a186a 100644 --- a/CLIENT_DATA/mozilla.cfg.xp +++ b/CLIENT_DATA/mozilla.cfg.xp @@ -8,14 +8,24 @@ lockPref("app.update.enabled", false); // stops the 'know your rights' button from displaying on first run pref("browser.rights.3.shown", true); pref("mail.rights.version", 1); -// stops the request to send performance data from displaying -pref("toolkit.telemetry.prompted", true); -// imap folder redirection -pref("mail.root.imap-rel", "[ProfD]../../../../Lokale Einstellungen/Anwendungsdaten/Thunderbird/ImapMail"); -pref("mail.root.imap", "[ProfD]../../../../Lokale Einstellungen/Anwendungsdaten/Thunderbird/ImapMail"); +// stops the request to send performance data from displaying +pref("toolkit.telemetry.prompted", 2); +pref("toolkit.telemetry.rejected", true); +pref("toolkit.telemetry.enabled", false); + +// prevent the Migration Assistant and the What's New page from showing after upgrades +pref("mail.ui.show.migration.on.upgrade", false); +pref("app.update.showInstalledUI", false); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("mailnews.start_page_override.mstone", "ignore"); // settings for add-on installations // https://developer.mozilla.org/en-US/docs/Installing_extensions // pref("extensions.autoDisableScopes", 15); // pref("extensions.enabledScopes", 4); + +// imap folder redirection +pref("mail.root.imap-rel", "[ProfD]../../../../Lokale Einstellungen/Anwendungsdaten/Thunderbird/ImapMail"); +pref("mail.root.imap", "[ProfD]../../../../Lokale Einstellungen/Anwendungsdaten/Thunderbird/ImapMail"); + diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 033e70a..95043b7 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -92,22 +92,30 @@ cd %SystemDrive% cd "$LogDir$\$ProductId$" addons.exe +rem move extensions before install +mkdir "$InstallDir$" +move "$LogDir$\$ProductId$\Extract\Addons\extensions" "$InstallDir$\extensions" + rem Original Install routine REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 /f "$InstallExe$" -ms "%ProgramFiles32Dir%\Mozilla Maintenance Service\uninstall.exe" /S +rem Move bundles after install +mkdir "$InstallDir$\distribution" +move "$LogDir$\$ProductId$\Extract\Addons\bundles" "$InstallDir$\distribution\bundles" + rem Cleanup temporary extract folder -rem cd "$LogDir$" -rem rmdir /S /Q "$LogDir$\$ProductId$" +cd "$LogDir$" +rmdir /S /Q "$LogDir$\$ProductId$" [Files_install] ; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" -; copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" -copy -s "$LogDir$\$ProductId$\Extract\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" -copy -s "$LogDir$\$ProductId$\Extract\Addons\extensions\*.*" "$InstallDir$\extensions" +copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" +; copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" +; copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi" diff --git a/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum b/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum index a0a8c62..54a7382 100644 --- a/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum +++ b/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum @@ -1 +1 @@ -933d1dfaafecf9be772f83a859f9acb86b736f4b /home/mario/.opsi-dist-cache/mozilla.thunderbird-24.2.0/X86/en-US@dictionaries.addons.mozilla.org.xpi +933d1dfaafecf9be772f83a859f9acb86b736f4b /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-24.2.0/X86/en-US@dictionaries.addons.mozilla.org.xpi