From 33408115ea0d0bd054d294a007e7e96d7aaf8ee9 Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Mon, 6 May 2013 08:46:59 +0200 Subject: [PATCH] Only temp --- CLIENT_DATA/mozilla.cfg | 16 ++++++++++- CLIENT_DATA/setup32.ins | 4 ++- builder-product.cfg | 10 +++++++ builder-targets-cb.sh | 27 ++++++++++++++----- exquilla@mesquilla.com.xpi.sha1sum | 2 +- quickfolders@curious.be.xpi.sha1sum | 2 +- sogo-connector@inverse.ca.xpi.sha1sum | 2 +- ...9-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum | 2 +- ...F-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum | 2 +- ...2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum | 2 +- ...0-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum | 2 +- ...0-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum | 2 +- ...4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum | 2 +- 13 files changed, 57 insertions(+), 18 deletions(-) diff --git a/CLIENT_DATA/mozilla.cfg b/CLIENT_DATA/mozilla.cfg index b3f848e..59ca2f4 100644 --- a/CLIENT_DATA/mozilla.cfg +++ b/CLIENT_DATA/mozilla.cfg @@ -1,7 +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/Thunderbird/ImapMail"); pref("mail.root.imap", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); -// pref("extensions.checkUpdateSecurity", false); + +// 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 511e9e1..717195d 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -86,7 +86,9 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" -copy -s "%ScriptPath%\X86\Addons\*.*" "$InstallDir$\distribution\extensions" +copy "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" +copy "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" + del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi" [Registry_install] diff --git a/builder-product.cfg b/builder-product.cfg index be4b399..22c9bcc 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -25,46 +25,56 @@ DL_WINST_NAME[1]=InstallExe DL_FILE[2]="{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi" DL_SOURCE[2]="https://addons.cdn.mozilla.net/_files/_attachments/2313/lightning-1.9.1-sm+tb-windows.xpi" DL_ARCH[2]="X86" +# DL_EXTRACT_FORMAT[2]="cp" +DL_EXTRACT_TO[2]="Addons/bundles" DL_WINST_NAME[2]=LightningPluginXpi DL_FILE[3]="sogo-connector@inverse.ca.xpi" DL_SOURCE[3]="http://www.sogo.nu/files/downloads/extensions/sogo-connector-17.0.3.xpi" DL_ARCH[3]="X86" +DL_EXTRACT_TO[3]="Addons/bundles" DL_WINST_NAME[3]=SogoConnectorPluginXpi DL_FILE[4]="{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi" DL_SOURCE[4]="https://addons.cdn.mozilla.net/_files/_attachments/71/enigmail-1.5.1-sm+tb.xpi" DL_ARCH[4]="X86" +DL_EXTRACT_TO[4]="Addons/extensions" DL_WINST_NAME[4]=EnigMailPluginXpi DL_FILE[5]="{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi" DL_SOURCE[5]="https://addons.cdn.mozilla.net/_files/_attachments/611/signature_switch-1.6.11-tb.xpi" DL_ARCH[5]="X86" +DL_EXTRACT_TO[5]="Addons/bundles" DL_WINST_NAME[5]=SignatureSwitchPluginXpi DL_FILE[6]="{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi" DL_SOURCE[6]="https://addons.cdn.mozilla.net/_files/_attachments/4654/remove_duplicate_messages_alternate-0.3.8b-tb.xpi" DL_ARCH[6]="X86" +DL_EXTRACT_TO[6]="Addons/bundles" DL_WINST_NAME[6]=RemoveDupMessagePluginXpi DL_FILE[7]="quickfolders@curious.be.xpi" DL_SOURCE[7]="https://addons.cdn.mozilla.net/_files/_attachments/3254/quickfolders_tabbed_folders-3.11-tb+sm.xpi" DL_ARCH[7]="X86" +DL_EXTRACT_TO[7]="Addons/bundles" DL_WINST_NAME[7]=QuickFolderPluginXpi DL_FILE[8]="{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi" DL_SOURCE[8]="https://addons.cdn.mozilla.net/_files/_attachments/330424/printingtools-1.2.0.2-tb.xpi" 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_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 diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 5b39d05..59ae986 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -28,17 +28,30 @@ function create() { echo "Create" builder_create - mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons - mv $INST_DIR/CLIENT_DATA/X86/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons - - pushd $INST_DIR/CLIENT_DATA/X86/Addons - + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/bundles +# mv $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/bundles + + pushd $INST_DIR/CLIENT_DATA/X86/Addons/bundles for file in `ls *.xpi` do dirname=`echo $file|sed 's/\.xpi$//g'` mkdir $dirname - 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/$file + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/bundles/$file done - popd + rm $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi + + + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/extensions +# mv $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/extensions + + pushd $INST_DIR/CLIENT_DATA/X86/Addons/extensions + for file in `ls *.xpi` + do + dirname=`echo $file|sed 's/\.xpi$//g'` + mkdir $dirname + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/extensions/$file + done + popd + rm $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi } diff --git a/exquilla@mesquilla.com.xpi.sha1sum b/exquilla@mesquilla.com.xpi.sha1sum index 1729516..2ff13a4 100644 --- a/exquilla@mesquilla.com.xpi.sha1sum +++ b/exquilla@mesquilla.com.xpi.sha1sum @@ -1 +1 @@ -1563ef80564d2cdc6bdcf862e24994948a310960 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/exquilla@mesquilla.com.xpi +17fc5400efb554e84952c6067cac2f95de559bbd /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/exquilla@mesquilla.com.xpi diff --git a/quickfolders@curious.be.xpi.sha1sum b/quickfolders@curious.be.xpi.sha1sum index 6815367..86a2554 100644 --- a/quickfolders@curious.be.xpi.sha1sum +++ b/quickfolders@curious.be.xpi.sha1sum @@ -1 +1 @@ -768dcea5c7e1faf442d852a70a22f78ccd64cf8b /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/quickfolders@curious.be.xpi +768dcea5c7e1faf442d852a70a22f78ccd64cf8b /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/quickfolders@curious.be.xpi diff --git a/sogo-connector@inverse.ca.xpi.sha1sum b/sogo-connector@inverse.ca.xpi.sha1sum index 40e931a..a192eb4 100644 --- a/sogo-connector@inverse.ca.xpi.sha1sum +++ b/sogo-connector@inverse.ca.xpi.sha1sum @@ -1 +1 @@ -8e915fd74ec620bf6a5d52719f32f5f837822c83 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/sogo-connector@inverse.ca.xpi +8e915fd74ec620bf6a5d52719f32f5f837822c83 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/sogo-connector@inverse.ca.xpi diff --git a/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum index 1f350d5..203d79b 100644 --- a/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum +++ b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum @@ -1 +1 @@ -dcfeeb4ce931639fabacfbe9d9b2799dc5939980 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi +dcfeeb4ce931639fabacfbe9d9b2799dc5939980 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi diff --git a/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum b/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum index d4ab855..877566a 100644 --- a/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum +++ b/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum @@ -1 +1 @@ -00020f88e3862a1b6804c564ee6550f51244bdae /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi +8006e4b28db6f63469ed14620746d4df998c17a4 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi diff --git a/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum b/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum index c0f9e33..6ae31e4 100644 --- a/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum +++ b/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum @@ -1 +1 @@ -91e196f8af326d7920720faa3d851e9d4b3030fc /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi +91e196f8af326d7920720faa3d851e9d4b3030fc /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi diff --git a/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum index 38e0859..4b436d9 100644 --- a/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum +++ b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum @@ -1 +1 @@ -066f026203e89aea4703d2c562bb176ae3b3b7d6 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi +066f026203e89aea4703d2c562bb176ae3b3b7d6 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi diff --git a/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum b/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum index 8390a2d..62c3837 100644 --- a/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum +++ b/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum @@ -1 +1 @@ -dd6635e72ccac1beb021aac9d21b41ecccc7713b /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi +dd6635e72ccac1beb021aac9d21b41ecccc7713b /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi diff --git a/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum b/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum index b366298..92baa3a 100644 --- a/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum +++ b/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum @@ -1 +1 @@ -5b4325872b9b0250db7cf6ddeb8879f9dc2bc4b3 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi +5b4325872b9b0250db7cf6ddeb8879f9dc2bc4b3 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi