From 97c34162cfdc95afb575e7cee970e41085bda92c Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 17 Jul 2012 08:12:31 +0200 Subject: [PATCH] sp1 inclided in new office downloads --- CLIENT_DATA/setup3264.ins | 22 ++++++++--------- builder-product.cfg | 24 +++++++++---------- ...1-kb2460049-x64-fullfile-de-de.exe.sha1sum | 1 - ...1-kb2460049-x86-fullfile-de-de.exe.sha1sum | 1 - 4 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe.sha1sum delete mode 100644 officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe.sha1sum diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index ad959b7..aeab43f 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -82,9 +82,9 @@ else Winbatch_extract_32 Sub_check_exitcode - comment "Extract Office Updates" - Winbatch_update_32 - Sub_check_exitcode +; comment "Extract Office Updates" +; Winbatch_update_32 +; Sub_check_exitcode comment "Create License File" Dosbatch_license_32 @@ -110,27 +110,27 @@ else Message "Installing " + $ProductId$ + " 64 Bit..." comment "Remove Install Files" - Winbatch_remove_32 + Winbatch_remove_64 Sub_check_exitcode comment "Extract Office" - Winbatch_extract_32 + Winbatch_extract_64 Sub_check_exitcode - comment "Extract Office Updates" - Winbatch_update_32 - Sub_check_exitcode +; comment "Extract Office Updates" +; Winbatch_update_64 +; Sub_check_exitcode comment "Create License File" - Dosbatch_license_32 + Dosbatch_license_64 Sub_check_exitcode comment "Start setup program" - Winbatch_install_32 + Winbatch_install_64 Sub_check_exitcode comment "Remove Install Files" - Winbatch_remove_32 + Winbatch_remove_64 Sub_check_exitcode comment "Copy files" diff --git a/builder-product.cfg b/builder-product.cfg index db4c8bc..caf2b32 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -20,20 +20,20 @@ DL_SOURCE[1]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office201 DL_ARCH[1]="X86" DL_WINST_NAME[1]=Install32Exe -DL_FILE[2]="officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe" -DL_SOURCE[2]="http://download.microsoft.com/download/4/3/D/43DB7693-6B64-4DB7-B137-D10E8DA4929B/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe" -DL_ARCH[2]="X86" -DL_WINST_NAME[2]=Install32Sp1Exe +DL_FILE[2]="X17-75168.exe" +DL_SOURCE[2]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X17-75168.exe" +DL_ARCH[2]="X86_64" +DL_WINST_NAME[2]=Install64Exe -DL_FILE[3]="X17-75168.exe" -DL_SOURCE[3]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X17-75168.exe" -DL_ARCH[3]="X86_64" -DL_WINST_NAME[3]=Install64Exe +#DL_FILE[3]="officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe" +#DL_SOURCE[3]="http://download.microsoft.com/download/4/3/D/43DB7693-6B64-4DB7-B137-D10E8DA4929B/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe" +#DL_ARCH[3]="X86" +#DL_WINST_NAME[3]=Install32Sp1Exe -DL_FILE[4]="officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe" -DL_SOURCE[4]="http://download.microsoft.com/download/5/9/C/59CFD567-4643-40E1-BC68-7FB02994E942/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe" -DL_ARCH[4]="X86_64" -DL_WINST_NAME[4]=Install64Sp1Exe +#DL_FILE[4]="officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe" +#DL_SOURCE[4]="http://download.microsoft.com/download/5/9/C/59CFD567-4643-40E1-BC68-7FB02994E942/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe" +#DL_ARCH[4]="X86_64" +#DL_WINST_NAME[4]=Install64Sp1Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 diff --git a/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe.sha1sum b/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe.sha1sum deleted file mode 100644 index edb377c..0000000 --- a/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -e728c2c1081d48bba264e3f39e22227241c5e449 /home/mario/.opsi-dist-cache/msoffice2010-2010.1/X86_64/officesuite2010sp1-kb2460049-x64-fullfile-de-de.exe diff --git a/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe.sha1sum b/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe.sha1sum deleted file mode 100644 index 1b62bc2..0000000 --- a/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -17957cdf76f282f5872d629e65e0aa80f6acd808 /home/mario/.opsi-dist-cache/msoffice2010-2010.1/X86/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe