diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 00085ff..74da666 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -89,9 +89,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 @@ -125,9 +125,9 @@ else Winbatch_extract_64 Sub_check_exitcode - ;comment "Extract Office Updates" - ;Winbatch_update_64 - ;Sub_check_exitcode + comment "Extract Office Updates" + Winbatch_update_64 + Sub_check_exitcode comment "Create License File" Dosbatch_license_64 @@ -154,8 +154,8 @@ endif [Winbatch_extract_32] $Install32Exe$ /quiet /extract:$LogDir$\msoffice2010-32 -;[Winbatch_update_32] -;$Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-32\Updates +[Winbatch_update_32] +$Install32Sp2Exe$ /quiet /extract:$LogDir$\msoffice2010-32\Updates [Dosbatch_license_32] xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir32$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-32.xml @@ -177,8 +177,8 @@ copy "$IniCfgFile$" "$InstallDir32$" [Winbatch_extract_64] $Install64Exe$ /quiet /extract:$LogDir$\msoffice2010-64 -;[Winbatch_update_64] -;$Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-64\Updates +[Winbatch_update_64] +$Install64Sp2Exe$ /quiet /extract:$LogDir$\msoffice2010-64\Updates [Dosbatch_license_64] xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir64$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-64.xml diff --git a/Office2010logo.png.sha1sum b/MS-Office.png.sha1sum similarity index 56% rename from Office2010logo.png.sha1sum rename to MS-Office.png.sha1sum index c9adef8..db73760 100644 --- a/Office2010logo.png.sha1sum +++ b/MS-Office.png.sha1sum @@ -1 +1 @@ -472954ff01e819fc8f6da901871546ccce5e9414 /home/mario/.opsi-dist-cache/msoffice2010-2010.1//Office2010logo.png +472954ff01e819fc8f6da901871546ccce5e9414 /home/mario/.opsi-dist-cache/microsoft.office2010-2010.2//MS-Office.png diff --git a/builder-product.cfg b/builder-product.cfg index 556c38f..0ecd982 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="microsoft.com" PN="microsoft.office2010" NAME="Microsoft Office 2010" DESCRIPTION="Microsoft Office 2010 ist ein Office-Paket von Microsoft aus der Microsoft-Office-Serie." -VERSION="2010.1" +VERSION="2010.2" RELEASE="3" PRIORITY="0" ADVICE="" @@ -14,8 +14,8 @@ ADVICE="" # Valid value: restricted | public TYPE="restricted" -DL_FILE[0]="Office2010logo.png" -DL_SOURCE[0]="http://blog.concurrency.com/wp-content/uploads/2011/10/Office2010logo.png" +DL_FILE[0]="MS-Office.png" +DL_SOURCE[0]="http://offices.depaul.edu/is/services/technology-training/PublishingImages/MS%20Office.png" DL_FILE[1]="X17-75062.exe" DL_SOURCE[1]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X17-75062.exe" @@ -27,15 +27,15 @@ DL_SOURCE[2]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office201 DL_ARCH[2]="X86_64" DL_WINST_NAME[2]=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[3]="officesp2010-kb2687455-fullfile-x86-de-de.exe" +DL_SOURCE[3]="http://download.microsoft.com/download/6/2/F/62FA5A81-8D8B-43C4-B089-8FB88FF6F94F/officesp2010-kb2687455-fullfile-x86-de-de.exe" +DL_ARCH[3]="X86" +DL_WINST_NAME[3]=Install32Sp2Exe -#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]="officesp2010-kb2687455-fullfile-x64-de-de.exe" +DL_SOURCE[4]="http://download.microsoft.com/download/A/7/5/A75DC999-3AF8-4562-8E10-25C8FECD3D7B/officesp2010-kb2687455-fullfile-x64-de-de.exe" +DL_ARCH[4]="X86_64" +DL_WINST_NAME[4]=Install64Sp2Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 diff --git a/officesp2010-kb2687455-fullfile-x64-de-de.exe.sha1sum b/officesp2010-kb2687455-fullfile-x64-de-de.exe.sha1sum new file mode 100644 index 0000000..bff77b0 --- /dev/null +++ b/officesp2010-kb2687455-fullfile-x64-de-de.exe.sha1sum @@ -0,0 +1 @@ +c18ceb86811e4b039c591a0ee52c3e388792b155 /home/mario/.opsi-dist-cache/microsoft.office2010-2010.2/X86_64/officesp2010-kb2687455-fullfile-x64-de-de.exe diff --git a/officesp2010-kb2687455-fullfile-x86-de-de.exe.sha1sum b/officesp2010-kb2687455-fullfile-x86-de-de.exe.sha1sum new file mode 100644 index 0000000..81e10a5 --- /dev/null +++ b/officesp2010-kb2687455-fullfile-x86-de-de.exe.sha1sum @@ -0,0 +1 @@ +a60451ac9469449dbf46b455e92298283c7bb8ef /home/mario/.opsi-dist-cache/microsoft.office2010-2010.2/X86/officesp2010-kb2687455-fullfile-x86-de-de.exe