From 54c55b1668763a7fea83cb3aedfa429cece32b2b Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Mon, 24 Jun 2013 12:43:33 +0200 Subject: [PATCH] Fixed critical bug for Windows XP and added compression for add ons (speedup) --- 7zsd_extra_150_2712.7z.sha1sum | 1 + CLIENT_DATA/7Zip_config.txt | 4 ++++ CLIENT_DATA/mozilla.cfg.xp | 21 ++++++++++++++++++ CLIENT_DATA/setup32.ins | 38 ++++++++++++++++++++++++++++----- builder-product.cfg | 39 ++++++++++++++++++++-------------- builder-targets-cb.sh | 5 +++++ 6 files changed, 87 insertions(+), 21 deletions(-) create mode 100644 7zsd_extra_150_2712.7z.sha1sum create mode 100644 CLIENT_DATA/7Zip_config.txt create mode 100644 CLIENT_DATA/mozilla.cfg.xp diff --git a/7zsd_extra_150_2712.7z.sha1sum b/7zsd_extra_150_2712.7z.sha1sum new file mode 100644 index 0000000..a0a25f6 --- /dev/null +++ b/7zsd_extra_150_2712.7z.sha1sum @@ -0,0 +1 @@ +d358f546b804f5a8259fba93462fbfa91264f461 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.6/X86/7zsd_extra_150_2712.7z diff --git a/CLIENT_DATA/7Zip_config.txt b/CLIENT_DATA/7Zip_config.txt new file mode 100644 index 0000000..95685ec --- /dev/null +++ b/CLIENT_DATA/7Zip_config.txt @@ -0,0 +1,4 @@ +;!@Install@!UTF-8! +InstallPath="Extract" +GUIMode="1" +;!@InstallEnd@! diff --git a/CLIENT_DATA/mozilla.cfg.xp b/CLIENT_DATA/mozilla.cfg.xp new file mode 100644 index 0000000..db6daa1 --- /dev/null +++ b/CLIENT_DATA/mozilla.cfg.xp @@ -0,0 +1,21 @@ +// auto update +lockPref("app.update.auto", false); +lockPref("app.update.enabled", false); +// lockPref("extensions.update.enabled", false); +// lockPref("browser.search.update", false); +// pref("extensions.checkUpdateSecurity", 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"); + +// settings for add-on installations +// https://developer.mozilla.org/en-US/docs/Installing_extensions +// pref("extensions.autoDisableScopes", 15); +// pref("extensions.enabledScopes", 4); diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index d853e99..2e89d2d 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -21,6 +21,9 @@ DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" +DefVar $MSVersion$ +Set $MSVersion$ = GetMsVersionInfo + ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: ; from builder-product.cfg : all variables definded by attribute WINST[index] @@ -60,13 +63,17 @@ else Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" +; ChangeDirectory "%SCRIPTPATH%" + DosInAnIcon_install Winbatch_install Sub_check_exitcode - + comment "Copy files" Files_install /32Bit + if ( $MSVersion$ = "5.1" ) + DosInAnIcon_xp_install + endif comment "Patch Registry" Registry_install /32Bit @@ -75,22 +82,43 @@ else endif - [Winbatch_install] + +[DosInAnIcon_install] +rem Extact Addons +mkdir "$LogDir$\$ProductId$" +copy "%ScriptPath%\X86\addons.exe" "$LogDir$\$ProductId$" +cd %SystemDrive% +cd "$LogDir$\$ProductId$" +addons.exe +mkdir "$InstallDir$\distribution" +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 thia after install +move "$LogDir$\$ProductId$\Extract\Addons\bundles" "$InstallDir$\distribution\bundles" + +rem Cleanup temporary extract folder +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 "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" -copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" +; 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" +[DosInAnIcon_xp_install] +copy /Y "%ScriptPath%\mozilla.cfg.xp" "$InstallDir$\mozilla.cfg" + [Registry_install] ; Example of setting some values of an registry key: ; diff --git a/builder-product.cfg b/builder-product.cfg index af265a6..df450aa 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -64,30 +64,37 @@ DL_ARCH[8]="X86" DL_EXTRACT_TO[8]="Addons/bundles" DL_WINST_NAME[8]=PrintingToolsPluginXpi -DL_FILE[9]="{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi" -DL_SOURCE[9]="http://www.gargan.org/extensions/synckolab-NIGHTLY.xpi" +DL_FILE[9]="de_DE@dicts.j3e.de.xpi" +DL_SOURCE[9]="https://addons.mozilla.org/thunderbird/downloads/latest/9361/addon-9361-latest.xpi" DL_ARCH[9]="X86" DL_EXTRACT_TO[9]="Addons/bundles" -DL_WINST_NAME[9]=SyncKolab-NIGHTLY +DL_WINST_NAME[9]=GermanDictionaryXpi -DL_FILE[10]="exquilla@mesquilla.com.xpi" -DL_SOURCE[10]="http://mesquilla.net/exquilla-currentrelease-tb-windows.xpi" +DL_FILE[10]="en-US@dictionaries.addons.mozilla.org.xpi" +DL_SOURCE[10]="https://addons.mozilla.org/thunderbird/downloads/latest/3497/addon-3497-latest.xpi" DL_ARCH[10]="X86" -DL_EXTRACT_TO[10]="Addons/extensions" -DL_WINST_NAME[10]=Exquilla-Currentrelease +DL_EXTRACT_TO[10]="Addons/bundles" +DL_WINST_NAME[10]=EnglishDictionaryXpi -DL_FILE[11]="de_DE@dicts.j3e.de.xpi" -DL_SOURCE[11]="https://addons.mozilla.org/thunderbird/downloads/latest/9361/addon-9361-latest.xpi" +DL_FILE[11]="7zsd_extra_150_2712.7z" +DL_SOURCE[11]="http://7zsfx.solta.ru/files/7zsd_extra_150_2712.7z" DL_ARCH[11]="X86" -DL_EXTRACT_TO[11]="Addons/bundles" -DL_WINST_NAME[11]=GermanDictionaryXpi +DL_EXTRACT_FORMAT[11]="7zip" +DL_EXTRACT_TO[11]="7Zip" +DL_WINST_NAME[11]=7Zip -DL_FILE[12]="en-US@dictionaries.addons.mozilla.org.xpi" -DL_SOURCE[12]="https://addons.mozilla.org/thunderbird/downloads/latest/3497/addon-3497-latest.xpi" -DL_ARCH[12]="X86" -DL_EXTRACT_TO[12]="Addons/bundles" -DL_WINST_NAME[12]=EnglishDictionaryXpi +# DL_FILE[9]="{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi" +# DL_SOURCE[9]="http://www.gargan.org/extensions/synckolab-NIGHTLY.xpi" +# DL_ARCH[9]="X86" +# DL_EXTRACT_TO[9]="Addons/bundles" +# DL_WINST_NAME[9]=SyncKolab-NIGHTLY + +# DL_FILE[10]="exquilla@mesquilla.com.xpi" +# DL_SOURCE[10]="http://mesquilla.net/exquilla-currentrelease-tb-windows.xpi" +# DL_ARCH[10]="X86" +# DL_EXTRACT_TO[10]="Addons/extensions" +# DL_WINST_NAME[10]=Exquilla-Currentrelease OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="UninstallProg" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 59ae986..3be4050 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -54,4 +54,9 @@ function create() { done popd rm $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi + + 7z a $INST_DIR/CLIENT_DATA/X86/addons.7z $INST_DIR/CLIENT_DATA/X86/Addons/ + cat $INST_DIR/CLIENT_DATA/X86/7Zip/7zsd_All.sfx $INST_DIR/CLIENT_DATA/7Zip_config.txt $INST_DIR/CLIENT_DATA/X86/addons.7z > $INST_DIR/CLIENT_DATA/X86/addons.exe + rm $INST_DIR/CLIENT_DATA/X86/addons.7z + }