diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index a85be84..39bf217 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -3,32 +3,32 @@ DefStringList $productProperty$ DefVar $reboot$ Set $reboot$ = "false" -if ($sereby_dotnet1.1$ = "uninstall") +if ($sereby_dotnet1.1$ = "reinstall") Winbatch_dotnet1.1_uninstall opsiservicecall_dotnet1.1_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet2.0$ = "uninstall") +if ($sereby_dotnet2.0$ = "reinstall") Winbatch_dotnet2.0_uninstall opsiservicecall_dotnet2.0_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet3.0$ = "uninstall") +if ($sereby_dotnet3.0$ = "reinstall") Winbatch_dotnet3.0_uninstall opsiservicecall_dotnet3.0_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet3.5$ = "uninstall") +if ($sereby_dotnet3.5$ = "reinstall") Winbatch_dotnet3.5_uninstall opsiservicecall_dotnet3.5_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet4.0$ = "uninstall") +if ($sereby_dotnet4.0$ = "reinstall") Winbatch_dotnet4.0_uninstall opsiservicecall_dotnet4.0_uninstall Set $reboot$ = "true" endif -if ($sereby_dotnet4.5$ = "uninstall") +if ($sereby_dotnet4.5$ = "reinstall") Winbatch_dotnet4.5_uninstall opsiservicecall_dotnet4.5_uninstall Set $reboot$ = "true" @@ -40,47 +40,47 @@ if ($reboot$ = "true") ExitWindows /ImmediateReboot endif -if ($sereby_msjsharp$ = "uninstall") +if ($sereby_msjsharp$ = "reinstall") Winbatch_msjsharp_uninstall opsiservicecall_msjsharp_uninstall Set $reboot$ = "true" endif -if ($sereby_silver$ = "uninstall") +if ($sereby_silver$ = "reinstall") Winbatch_silver_uninstall opsiservicecall_silver_uninstall Set $reboot$ = "true" endif -if ($sereby_jre$ = "uninstall") +if ($sereby_jre$ = "reinstall") Dosbatch_jre_uninstall opsiservicecall_jre_uninstall Set $reboot$ = "true" endif -if ($sereby_AdobeShock$ = "uninstall") +if ($sereby_AdobeShock$ = "reinstall") Winbatch_AdobeShock_uninstall opsiservicecall_AdobeShock_uninstall Set $reboot$ = "true" endif -if ($sereby_basicruntimes$ = "uninstall") +if ($sereby_basicruntimes$ = "reinstall") Winbatch_basicruntimes_uninstall opsiservicecall_basicruntimes_uninstall Set $reboot$ = "true" endif -if ($sereby_msdx9$ = "uninstall") +if ($sereby_msdx9$ = "reinstall") Winbatch_msdx9_uninstall opsiservicecall_msdx9_uninstall Set $reboot$ = "true" endif -if ($sereby_msdxm$ = "uninstall") +if ($sereby_msdxm$ = "reinstall") Winbatch_msdxm_uninstall opsiservicecall_msdxm_uninstall Set $reboot$ = "true" endif -if ($sereby_msvc$ = "uninstall") +if ($sereby_msvc$ = "reinstall") Winbatch_msvc_uninstall opsiservicecall_msvc_uninstall Set $reboot$ = "true" endif -if ($sereby_AdobeFlash$ = "uninstall") +if ($sereby_AdobeFlash$ = "reinstall") Winbatch_AdobeFlash_uninstall opsiservicecall_AdobeFlash_uninstall Set $reboot$ = "true" diff --git a/OPSI/control b/OPSI/control index e6d1780..4bc6f68 100644 --- a/OPSI/control +++ b/OPSI/control @@ -69,7 +69,7 @@ name: sereby_dotnet1.1 multivalue: False editable: False description: Install Microsoft Netframework 1.1 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -78,7 +78,7 @@ name: sereby_dotnet2.0 multivalue: False editable: False description: Install Microsoft Netframework 2.0 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -87,7 +87,7 @@ name: sereby_dotnet3.0 multivalue: False editable: False description: Install Microsoft Netframework 3.0 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -96,7 +96,7 @@ name: sereby_dotnet3.5 multivalue: False editable: False description: Install Microsoft Netframework 3.5 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -105,7 +105,7 @@ name: sereby_dotnet4.0 multivalue: False editable: False description: Install Microsoft Netframework 4.0 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -114,7 +114,7 @@ name: sereby_dotnet4.5 multivalue: False editable: False description: Install Microsoft Netframework 4.5 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -123,7 +123,7 @@ name: sereby_msjsharp multivalue: False editable: False description: Install Microsoft Visual J-Sharp 2.0 SE -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -132,7 +132,7 @@ name: sereby_silver multivalue: False editable: False description: Install Microsoft Silverlight 5 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -141,7 +141,7 @@ name: sereby_jre multivalue: False editable: False description: Install Java Runtime Environment -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -150,7 +150,7 @@ name: sereby_AdobeShock multivalue: False editable: False description: Install Adobe Shockwave Player 11.6 -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -159,7 +159,7 @@ name: sereby_basicruntimes multivalue: False editable: False description: Install Basic Runtimes -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -168,7 +168,7 @@ name: sereby_msdx9 multivalue: False editable: False description: Install Microsoft DirectX 9.0c Redistributable -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -177,7 +177,7 @@ name: sereby_msdxm multivalue: False editable: False description: Install Microsoft DirectX for Managed Code -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -186,7 +186,7 @@ name: sereby_msvc multivalue: False editable: False description: Install Microsoft Visual C++ Runtimes -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] [ProductProperty] @@ -195,7 +195,7 @@ name: sereby_AdobeFlash multivalue: False editable: False description: Adobe Flash Player -values: ["install", "none", "uninstall"] +values: ["install", "none", "reinstall"] default: ["install"] diff --git a/builder-product.cfg b/builder-product.cfg index f7fcc60..0835254 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -93,3 +93,23 @@ OPSI_INI_SECTION[1]="X86_64" OPSI_INI_OPTION[1]="UninstallProg64" OPSI_INI_VALUE[1]="WinPKG.exe" +OPSI_INI_SECTION[2]="X86" +OPSI_INI_OPTION[2]="DotNet11MsiId" +OPSI_INI_VALUE[2]="{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1}" + +OPSI_INI_SECTION[3]="X86" +OPSI_INI_OPTION[3]="DotNet20MsiId" +OPSI_INI_VALUE[3]="{C09FB3CD-3D0C-3F2D-899A-6A1D67F2073F}" + +OPSI_INI_SECTION[4]="X86" +OPSI_INI_OPTION[4]="DotNet30MsiId" +OPSI_INI_VALUE[4]="{A3051CD0-2F64-3813-A88D-B8DCCDE8F8C7}" + +OPSI_INI_SECTION[5]="X86" +OPSI_INI_OPTION[5]="DotNet40ClientMsiId" +OPSI_INI_VALUE[5]="{3C3901C5-3455-3E0A-A214-0B093A5070A6}" + +OPSI_INI_SECTION[6]="X86" +OPSI_INI_OPTION[6]="DotNet40ExtendedMsiId" +OPSI_INI_VALUE[6]="{0A0CADCF-78DA-33C4-A350-CD51849B9702}" + diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 77a0d25..23f8733 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -59,6 +59,9 @@ function create() { # sed everything to disabled sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" $INST_DIR/CLIENT_DATA/X86/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml + # sed force update on flash + sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml + # move the uninstallers in place (directory layout like the sereby package) mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE diff --git a/windowsxp-msiids.txt b/windowsxp-msiids.txt new file mode 100644 index 0000000..f43f7c4 --- /dev/null +++ b/windowsxp-msiids.txt @@ -0,0 +1,278 @@ +msiinv.exe 2013\04\04 06:19:23 + +Microsoft .NET Framework 3.0 Service Pack 2 + Product code: {A3051CD0-2F64-3813-A88D-B8DCCDE8F8C7} + Product state: (5) Installed. + Assignment: per machine + Package code: {9DE1777A-C588-399C-9982-49EF5B4335D9} + Version: 3.2.30730 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\NET\3.0\ + Package: netfx.msi + Help link: http://go.microsoft.com/fwlink/?LinkId=98075 + Update link: http://go.microsoft.com/fwlink/?LinkId=98076 + Instance type: 0 + Local package: C:\WINDOWS\Installer\2ae8a.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft Visual C++ 2010 x86 Redistributable - 10.0.40219 + Product code: {F0C3E5D1-1ADE-321E-8167-68EF0DE699A5} + Product state: (5) Installed. + Assignment: per machine + Package code: {461C455E-DA40-49B3-871B-14308CC7CEFF} + Version: 10.0.40219 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\Packages\MSVC\x86\msvc_10\ + Package: vc_red.msi + Help link: http://go.microsoft.com/fwlink/?LinkId=146008 + Instance type: 0 + Local package: C:\WINDOWS\Installer\13960.msi + Install date: 2013\04\03 + Patch GUID: {6F8500D2-A80F-3347-9081-B41E71C8592B} + Transforms: :SP1.1;:#SP1.1 + 1 patch package. + +MSXML 6 Service Pack 2 (KB2758696) + Product code: {E46A76D1-9FB9-4770-BA24-3975EF4D120A} + Product state: (5) Installed. + Assignment: per machine + Package code: {EE6525FC-1729-4E76-A8C1-12C756BA0AD0} + Version: 6.20.2016.0 + Publisher: Microsoft Corporation + Language: 1033 + Installed from: P:\sereby.aio\Install\NET\3.0\x86\ + Package: msxml6.msi + Product Icon: C:\WINDOWS\Installer\{E46A76D1-9FB9-4770-BA24-3975EF4D120A}\ARPIco + Help link: http://support.microsoft.com/kb/2758696 + Instance type: 0 + Transforms: C:\WINDOWS\Installer\{E46A76D1-9FB9-4770-BA24-3975EF4D120A}\msxml6.mst + Local package: C:\WINDOWS\Installer\2ae81.msi + Install date: 2013\04\03 + 0 patch packages. + +WebFldrs XP + Product code: {350C97B3-3D7C-4EE8-BAA9-00BCB3D54227} + Product state: (5) Installed. + Assignment: per machine + Package code: {350C97B3-3D7C-4EE8-BAA9-00BCB3D54227} + Version: 9.50.7523 + Publisher: Microsoft Corporation + Language: 1033 + Installed from: C:\WINDOWS\system32\ + Package: webfldrs.msi + Help link: http://www.microsoft.com/windows + Instance type: 0 + Local package: C:\WINDOWS\Installer\28fa7.msi + Install date: 2012\01\22 + 0 patch packages. + +Java 7 Update 17 + Product code: {26A24AE4-039D-4CA4-87B4-2F83217017FF} + Product state: (5) Installed. + Assignment: per machine + Package code: {1FBC0BD3-6C46-4CA3-8354-61C157AA98E1} + Version: 7.0.170 + Publisher: Oracle + Language: 0 + Suggested installation location: C:\Programme\Java\jre7\ + Installed from: P:\sereby.aio\Install\Packages\JRE\x86\ + Package: jre.msi + About link: http://java.com + Help link: http://java.com + Update link: http://java.sun.com + Instance type: 0 + Local package: C:\WINDOWS\Installer\9365.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft .NET Framework 4 Client Profile + Product code: {3C3901C5-3455-3E0A-A214-0B093A5070A6} + Product state: (5) Installed. + Assignment: per machine + Package code: {3DC8025F-08D2-30AF-B7B3-1E2819040010} + Version: 4.0.30320 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\NET\4.0\ + Package: netfx_Core_x86.msi + Product Icon: C:\WINDOWS\Installer\{3C3901C5-3455-3E0A-A214-0B093A5070A6}\DisplayIcon + About link: http://go.microsoft.com/fwlink/?LinkId=164164 + Update link: http://go.microsoft.com/fwlink/?LinkId=164165 + Instance type: 0 + Local package: C:\WINDOWS\Installer\2ae92.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161 + Product code: {9BE518E6-ECC6-35A9-88E4-87755C07200F} + Product state: (5) Installed. + Assignment: per machine + Package code: {00073E4B-0EA7-48DB-9C41-FDA7E9BB4839} + Version: 9.0.30729.6161 + Publisher: Microsoft Corporation + Language: 1033 + Installed from: P:\sereby.aio\Install\Packages\MSVC\x86\msvc_08\ + Package: vc_red.msi + Instance type: 0 + Local package: C:\WINDOWS\Installer\1395a.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft Visual C++ 2008 Redistributable - x86 9.0.21022 + Product code: {FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4} + Product state: (5) Installed. + Assignment: per machine + Package code: {3D70273F-3F36-4EBF-9310-6D1914596B42} + Version: 9.0.21022 + Publisher: Microsoft Corporation + Language: 1033 + Installed from: C:\opsi\opsi-client-agent\files\opsi\deps\ + Package: VC_RED.MSI + Instance type: 0 + Local package: C:\WINDOWS\Installer\b123.msi + Install date: 2012\01\22 + 0 patch packages. + +Adobe Shockwave Player 12.0 + Product code: {FF2A5498-4EFE-430F-A138-7EB365DBEBAD} + Product state: (5) Installed. + Assignment: per machine + Package code: {8CE75CB6-2B26-44E0-B71E-36E6BFEBF27D} + Version: 12.0.0.112 + Publisher: Adobe Systems, Inc + Language: 1033 + Suggested installation location: C:\WINDOWS\system32\Adobe\ + Installed from: P:\sereby.aio\Install\Packages\Shockwave\ + Package: sw_lic_full_installer.msi + Product Icon: C:\WINDOWS\Installer\{FF2A5498-4EFE-430F-A138-7EB365DBEBAD}\ARPPRODUCTICON.exe + About link: http://www.adobe.com + Help link: http://www.adobe.com/support/shockwave + Update link: http://www.adobe.com/software/shockwaveplayer/index.html + Instance type: 0 + Local package: C:\WINDOWS\Installer\2aea9.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft Visual J# 2.0 Redistributable Package - SE + Product code: {DFAA3D2B-7087-464E-823B-738A23C29C27} + Product state: (5) Installed. + Assignment: per machine + Package code: {382461D8-B479-40D0-96FC-467163FF4FBB} + Version: 2.0.50728 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\Packages\jsredist\x86\ + Package: jsredist.msi + Instance type: 0 + Local package: C:\WINDOWS\Installer\2aea4.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft Visual C++ 2005 Redistributable + Product code: {710f4c1c-cc18-4c49-8cbf-51240c89a1a2} + Product state: (5) Installed. + Assignment: per machine + Package code: {31076048-5B7B-4476-ABF0-15989228CB90} + Version: 8.0.61001 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\Packages\MSVC\x86\msvc_05\ + Package: vcredist.msi + Instance type: 0 + Local package: C:\WINDOWS\Installer\13954.msi + Install date: 2013\04\03 + 0 patch packages. + +VMware Tools + Product code: {FE2F6A2C-196E-4210-9C04-2B1BC21F07EF} + Product state: (5) Installed. + Assignment: per machine + Package code: {B56367BE-6AE1-44D3-A0C2-4FA8C360C04F} + Version: 8.3.7.6505 + Publisher: VMware, Inc. + Language: 0 + Suggested installation location: C:\Programme\VMware\VMware Tools\ + Installed from: D:\ + Package: VMware Tools.msi + Product Icon: C:\WINDOWS\Installer\{FE2F6A2C-196E-4210-9C04-2B1BC21F07EF}\ARPPRODUCTICON.exe + About link: http://www.vmware.com + Instance type: 0 + Transforms: C:\WINDOWS\Installer\{FE2F6A2C-196E-4210-9C04-2B1BC21F07EF}\1031.mst + Local package: C:\WINDOWS\Installer\28fac.msi + Install date: 2012\01\22 + 0 patch packages. + +Microsoft Silverlight + Product code: {89F4137D-6C26-4A84-BDB8-2E5A4BB71E00} + Product state: (5) Installed. + Assignment: per machine + Package code: {5940692D-79C1-476B-9CAF-CDA674424AA0} + Version: 5.1.20125.0 + Publisher: Microsoft Corporation + Language: 1033 + Suggested installation location: c:\Programme\Microsoft Silverlight\ + Installed from: c:\714a8663e5c3521e24b3\ + Package: silverlight.msi + Product Icon: c:\WINDOWS\Installer\{89F4137D-6C26-4A84-BDB8-2E5A4BB71E00}\ARPIcon + Help link: http://go.microsoft.com/fwlink/?LinkID=91955 + Instance type: 0 + Local package: c:\WINDOWS\Installer\2aeae.msi + Install date: 2013\04\03 + Patch GUID: {05EF7161-807E-4A8B-BAB6-D816B83603D8} + Transforms: :oldTocurrent;:#oldTocurrent + 1 patch package. + +Microsoft .NET Framework 2.0 Service Pack 2 + Product code: {C09FB3CD-3D0C-3F2D-899A-6A1D67F2073F} + Product state: (5) Installed. + Assignment: per machine + Package code: {A0E6186F-29A6-39F8-93B0-CD338ED85F1F} + Version: 2.3.30730 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\NET\2.0\ + Package: netfx.msi + Help link: http://go.microsoft.com/fwlink/?LinkId=98073 + Update link: http://go.microsoft.com/fwlink/?LinkId=98074 + Instance type: 0 + Local package: C:\WINDOWS\Installer\2ae7a.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft .NET Framework 1.1 + Product code: {CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1} + Product state: (5) Installed. + Assignment: per machine + Package code: {19EC6A42-38E5-4812-9F42-A40667790E57} + Version: 1.1.4322 + Publisher: Microsoft + Language: 1031 + Installed from: P:\sereby.aio\Install\NET\1.1\ + Package: netfx.msi + Instance type: 0 + Local package: C:\WINDOWS\Installer\2ae9f.msi + Install date: 2013\04\03 + 0 patch packages. + +Microsoft .NET Framework 4 Extended + Product code: {0A0CADCF-78DA-33C4-A350-CD51849B9702} + Product state: (5) Installed. + Assignment: per machine + Package code: {788818B1-B191-3217-A210-7ACFDE19CE4A} + Version: 4.0.30320 + Publisher: Microsoft Corporation + Language: 0 + Installed from: P:\sereby.aio\Install\NET\4.0\ + Package: netfx_Extended_x86.msi + Product Icon: C:\WINDOWS\Installer\{0A0CADCF-78DA-33C4-A350-CD51849B9702}\DisplayIcon + About link: http://go.microsoft.com/fwlink/?LinkId=164164 + Update link: http://go.microsoft.com/fwlink/?LinkId=164165 + Instance type: 0 + Local package: C:\WINDOWS\Installer\2ae97.msi + Install date: 2013\04\03 + 0 patch packages. + +16 products installed.