From c850c5f93c8e27b55df828e2498bab3e11ba8cf9 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 28 Jun 2018 17:36:08 +0200 Subject: [PATCH] Bump --- ...9_package.xml => Sereby_JRE10_package.xml} | 6 +-- CLIENT_DATA/Sereby_JRE10_x64_silent.bat | 3 ++ ...silent.bat => Sereby_JRE10_x86_silent.bat} | 2 +- CLIENT_DATA/Sereby_JRE9_x64_silent.bat | 3 -- CLIENT_DATA/WinPKG.xml | 2 +- CLIENT_DATA/cleanup3264.ins | 22 ++++---- CLIENT_DATA/config3264.ins | 8 +-- CLIENT_DATA/define3264.inc | 4 +- OPSI/control | 4 +- aio-runtimes_v2.4.5.1.exe.sha1sum | 1 - aio-runtimes_v2.4.6.1.exe.sha1sum | 1 + air_29.0.0.112_win.exe.sha1sum | 1 - air_30.0.0.107_win.exe.sha1sum | 1 + builder-product.cfg | 41 +++++++-------- builder-targets-cb.sh | 50 +++++++++---------- dotnetfx_cleanup_tool-2.4.5.1.zip.sha1sum | 1 - dotnetfx_cleanup_tool-2.4.6.1.zip.sha1sum | 1 + install_flash_player-29.0.0.113.exe.sha1sum | 1 - install_flash_player-30.0.0.113.exe.sha1sum | 1 + ...all_flash_player_ax-29.0.0.113.exe.sha1sum | 1 - ...all_flash_player_ax-30.0.0.113.exe.sha1sum | 1 + jre10.0.1-b10-x64.exe.sha1sum | 1 + jre10.0.1-b10-x86.exe.sha1sum | 1 + jre8u162-b12-x64.exe.sha1sum | 1 - jre8u162-b12-x86.exe.sha1sum | 1 - jre8u172-b11-x64.exe.sha1sum | 1 + jre8u172-b11-x86.exe.sha1sum | 1 + jre9.0.4-b11-x64.exe.sha1sum | 1 - jre9.0.4-b11-x86.exe.sha1sum | 1 - sw_lic_full_installer-12.3.2.202.msi.sha1sum | 1 - sw_lic_full_installer-12.3.4.204.msi.sha1sum | 1 + uninstall_flash_player-29.0.0.113.exe.sha1sum | 1 - uninstall_flash_player-30.0.0.113.exe.sha1sum | 1 + ...nstall_shock_player-12.3.4.204.exe.sha1sum | 2 +- 34 files changed, 85 insertions(+), 84 deletions(-) rename CLIENT_DATA/{Sereby_JRE9_package.xml => Sereby_JRE10_package.xml} (63%) create mode 100644 CLIENT_DATA/Sereby_JRE10_x64_silent.bat rename CLIENT_DATA/{Sereby_JRE9_x86_silent.bat => Sereby_JRE10_x86_silent.bat} (67%) delete mode 100644 CLIENT_DATA/Sereby_JRE9_x64_silent.bat delete mode 100644 aio-runtimes_v2.4.5.1.exe.sha1sum create mode 100644 aio-runtimes_v2.4.6.1.exe.sha1sum delete mode 100644 air_29.0.0.112_win.exe.sha1sum create mode 100644 air_30.0.0.107_win.exe.sha1sum delete mode 100644 dotnetfx_cleanup_tool-2.4.5.1.zip.sha1sum create mode 100644 dotnetfx_cleanup_tool-2.4.6.1.zip.sha1sum delete mode 100644 install_flash_player-29.0.0.113.exe.sha1sum create mode 100644 install_flash_player-30.0.0.113.exe.sha1sum delete mode 100644 install_flash_player_ax-29.0.0.113.exe.sha1sum create mode 100644 install_flash_player_ax-30.0.0.113.exe.sha1sum create mode 100644 jre10.0.1-b10-x64.exe.sha1sum create mode 100644 jre10.0.1-b10-x86.exe.sha1sum delete mode 100644 jre8u162-b12-x64.exe.sha1sum delete mode 100644 jre8u162-b12-x86.exe.sha1sum create mode 100644 jre8u172-b11-x64.exe.sha1sum create mode 100644 jre8u172-b11-x86.exe.sha1sum delete mode 100644 jre9.0.4-b11-x64.exe.sha1sum delete mode 100644 jre9.0.4-b11-x86.exe.sha1sum delete mode 100644 sw_lic_full_installer-12.3.2.202.msi.sha1sum create mode 100644 sw_lic_full_installer-12.3.4.204.msi.sha1sum delete mode 100644 uninstall_flash_player-29.0.0.113.exe.sha1sum create mode 100644 uninstall_flash_player-30.0.0.113.exe.sha1sum rename uninstall_shock_player-12.3.2.202.exe.sha1sum => uninstall_shock_player-12.3.4.204.exe.sha1sum (51%) diff --git a/CLIENT_DATA/Sereby_JRE9_package.xml b/CLIENT_DATA/Sereby_JRE10_package.xml similarity index 63% rename from CLIENT_DATA/Sereby_JRE9_package.xml rename to CLIENT_DATA/Sereby_JRE10_package.xml index 5bed0f0..704c775 100644 --- a/CLIENT_DATA/Sereby_JRE9_package.xml +++ b/CLIENT_DATA/Sereby_JRE10_package.xml @@ -1,7 +1,7 @@ - - + + - + diff --git a/CLIENT_DATA/Sereby_JRE10_x64_silent.bat b/CLIENT_DATA/Sereby_JRE10_x64_silent.bat new file mode 100644 index 0000000..e93200f --- /dev/null +++ b/CLIENT_DATA/Sereby_JRE10_x64_silent.bat @@ -0,0 +1,3 @@ +@echo off +title Installiere Java 9 +%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre10" \ No newline at end of file diff --git a/CLIENT_DATA/Sereby_JRE9_x86_silent.bat b/CLIENT_DATA/Sereby_JRE10_x86_silent.bat similarity index 67% rename from CLIENT_DATA/Sereby_JRE9_x86_silent.bat rename to CLIENT_DATA/Sereby_JRE10_x86_silent.bat index 6f848d0..a62e1fc 100644 --- a/CLIENT_DATA/Sereby_JRE9_x86_silent.bat +++ b/CLIENT_DATA/Sereby_JRE10_x86_silent.bat @@ -3,4 +3,4 @@ SET pfdir=%ProgramFiles(x86)% IF "%pfdir%"=="" SET pfdir=%ProgramFiles% title Installiere Java 9 -%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre9" \ No newline at end of file +%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre10" \ No newline at end of file diff --git a/CLIENT_DATA/Sereby_JRE9_x64_silent.bat b/CLIENT_DATA/Sereby_JRE9_x64_silent.bat deleted file mode 100644 index 210cd9d..0000000 --- a/CLIENT_DATA/Sereby_JRE9_x64_silent.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -title Installiere Java 9 -%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre9" \ No newline at end of file diff --git a/CLIENT_DATA/WinPKG.xml b/CLIENT_DATA/WinPKG.xml index fb5cf60..dfd0d58 100644 --- a/CLIENT_DATA/WinPKG.xml +++ b/CLIENT_DATA/WinPKG.xml @@ -3,7 +3,7 @@ - + diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index e0fdedf..ee2ed34 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -58,14 +58,14 @@ if ($sereby_jre8$ = "uninstall") opsiservicecall_jre8_uninstall Set $reboot$ = "true" endif -if ($sereby_jre9$ = "reinstall") - DosInAnIcon_jre9_uninstall - opsiservicecall_jre9_reinstall +if ($sereby_jre10$ = "reinstall") + DosInAnIcon_jre10_uninstall + opsiservicecall_jre10_reinstall Set $reboot$ = "true" endif -if ($sereby_jre9$ = "uninstall") - DosInAnIcon_jre9_uninstall - opsiservicecall_jre9_uninstall +if ($sereby_jre10$ = "uninstall") + DosInAnIcon_jre10_uninstall + opsiservicecall_jre10_uninstall Set $reboot$ = "true" endif if ($sereby_AdobeShock$ = "reinstall") @@ -269,7 +269,7 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall "%opsiserviceUser%" ] -[DosInAnIcon_jre9_uninstall] +[DosInAnIcon_jre10_uninstall] @echo off rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\" rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS @@ -281,20 +281,20 @@ rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\" rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly -[opsiservicecall_jre9_reinstall] +[opsiservicecall_jre10_reinstall] "method": "setProductProperty" "params": [ "$ProductId$", -"sereby_jre9", +"sereby_jre10", "install", "%opsiserviceUser%" ] -[opsiservicecall_jre9_uninstall] +[opsiservicecall_jre10_uninstall] "method": "setProductProperty" "params": [ "$ProductId$", -"sereby_jre9", +"sereby_jre10", "none", "%opsiserviceUser%" ] diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index 82013ad..9a460d9 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -16,8 +16,8 @@ endif if ($sereby_silver$ = "install") DosInAnIcon_silver_config endif -if ($sereby_jre9$ = "install") - DosInAnIcon_jre9_config +if ($sereby_jre10$ = "install") + DosInAnIcon_jre10_config endif if ($sereby_jre8$ = "install") DosInAnIcon_jre8_config @@ -87,9 +87,9 @@ xml ed -O -u "/settings/set[@component='msfsharp']/@checked" -v 1 "$LogDir$\WinP copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[DosInAnIcon_jre9_config] +[DosInAnIcon_jre10_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='jre9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" +xml ed -O -u "/settings/set[@component='jre10']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" [DosInAnIcon_jre8_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index 11f9299..5ca0b2e 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -14,8 +14,8 @@ DefVar $sereby_msfsharp$ Set $sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install") DefVar $sereby_silver$ Set $sereby_silver$ = GetProductProperty("sereby_silver", "install") -DefVar $sereby_jre9$ -Set $sereby_jre9$ = GetProductProperty("sereby_jre9", "install") +DefVar $sereby_jre10$ +Set $sereby_jre10$ = GetProductProperty("sereby_jre10", "install") DefVar $sereby_jre8$ Set $sereby_jre8$ = GetProductProperty("sereby_jre8", "install") DefVar $sereby_AdobeShock$ diff --git a/OPSI/control b/OPSI/control index f68cf3c..8ad5e69 100644 --- a/OPSI/control +++ b/OPSI/control @@ -101,10 +101,10 @@ default: ["install"] [ProductProperty] type: unicode -name: sereby_jre9 +name: sereby_jre10 multivalue: False editable: False -description: Install Java 9 Runtime Environment +description: Install Java 10 Runtime Environment values: ["install", "none", "reinstall", "uninstall"] default: ["install"] diff --git a/aio-runtimes_v2.4.5.1.exe.sha1sum b/aio-runtimes_v2.4.5.1.exe.sha1sum deleted file mode 100644 index c136cda..0000000 --- a/aio-runtimes_v2.4.5.1.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -2878157f0a81e4d4177e1725ccb85942d0d19311 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/aio-runtimes_v2.4.5.1.exe diff --git a/aio-runtimes_v2.4.6.1.exe.sha1sum b/aio-runtimes_v2.4.6.1.exe.sha1sum new file mode 100644 index 0000000..239eee3 --- /dev/null +++ b/aio-runtimes_v2.4.6.1.exe.sha1sum @@ -0,0 +1 @@ +431c9809cbf7283cb6e1322923334636c54fbe41 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/aio-runtimes_v2.4.6.1.exe diff --git a/air_29.0.0.112_win.exe.sha1sum b/air_29.0.0.112_win.exe.sha1sum deleted file mode 100644 index b9cfe39..0000000 --- a/air_29.0.0.112_win.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -9460f20461e2b92abd30c03454c810dc919fc8ad /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/air_29.0.0.112_win.exe diff --git a/air_30.0.0.107_win.exe.sha1sum b/air_30.0.0.107_win.exe.sha1sum new file mode 100644 index 0000000..8b4d02f --- /dev/null +++ b/air_30.0.0.107_win.exe.sha1sum @@ -0,0 +1 @@ +5bc91827e80618e993b4ec1d660ceb9d7d54ef2c /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/air_30.0.0.107_win.exe diff --git a/builder-product.cfg b/builder-product.cfg index cfcab44..66fc30e 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="sereby.org" PN="sereby.aio" NAME="All in One Runtimes" DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren." -VERSION="2.4.5.1" +VERSION="2.4.6.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -29,39 +29,40 @@ CREATENEWSEREBY="1" # Adobe Air Verison # ================================== -AIRVERSION="29.0.0.112" -AIRMAJOR="29.0" +AIRVERSION="30.0.0.107" +AIRMAJOR="30.0" # ================================== # Update Java 7/8 # ================================== -JRE9UPDATE="1" -JRE9UVERSION="9.0.4" -JRE9BUILD="11" -JRE9VERSION="9.0.4" -JRE9DLID="c2514751926b4512b076cc82f959763f" +JRE10UPDATE="1" +JRE10UVERSION="10.0.1" +JRE10BUILD="10" +JRE10VERSION="10.0.1" +JRE10DLID="fb4372174a714e6b8c52526dc134031e" + JRE8UPDATE="1" -JRE8UVERSION="162" -JRE8BUILD="12" -JRE8VERSION="8.0.1620.12" -JRE8DLID="0da788060d494f5095bf8624735fa2f1" +JRE8UVERSION="172" +JRE8BUILD="11" +JRE8VERSION="8.0.1720.11" +JRE8DLID="a58eab1ec242421181065cdc37240b08" # ================================== # Update Adobe Flash # ================================== FLASHUPDATE="1" -FLASHVERSION="29.0.0.113" -FLASHAXVERSION="29.0.0.113" +FLASHVERSION="30.0.0.113" +FLASHAXVERSION="30.0.0.113" # ================================== # Update Adobe Schockave # ================================== SHOCKUPDATE="1" -SHOCKVERSION="12.3.2.202" +SHOCKVERSION="12.3.4.204" # ================================== # Update Microsoft Silverlight @@ -178,13 +179,13 @@ DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${ DL_ARCH[13]="X86" DL_WINST_NAME[13]=InstallJ8re64Exe -DL_FILE[14]="jre${JRE9UVERSION}-b${JRE9BUILD}-x86.exe" -DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/${JRE9UVERSION}+${JRE9BUILD}/${JRE9DLID}/jre-${JRE9UVERSION}_windows-x64_bin.exe" +DL_FILE[14]="jre${JRE10UVERSION}-b${JRE10BUILD}-x86.exe" +DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/${JRE10UVERSION}+${JRE10BUILD}/${JRE10DLID}/jre-${JRE10UVERSION}_windows-x64_bin.exe" DL_ARCH[14]="X86" DL_WINST_NAME[14]=Install9Jre32Exe -DL_FILE[15]="jre${JRE9UVERSION}-b${JRE9BUILD}-x64.exe" -DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/${JRE9UVERSION}+${JRE9BUILD}/${JRE9DLID}/jre-${JRE9UVERSION}_windows-x64_bin.exe" +DL_FILE[15]="jre${JRE10UVERSION}-b${JRE10BUILD}-x64.exe" +DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/${JRE10UVERSION}+${JRE10BUILD}/${JRE10DLID}/jre-${JRE10UVERSION}_windows-x64_bin.exe" DL_ARCH[15]="X86" DL_WINST_NAME[15]=Install9Jre64Exe @@ -260,7 +261,7 @@ DL_EXTRACT_TO[26]="MSVC" DL_FILE[1]="dotnetfx_cleanup_tool-${VERSION}.zip" #DL_SOURCE[1]="https://msdnshared.blob.core.windows.net/media/MSDNBlogsFS/prod.evol.blogs.msdn.com/CommunityServer.Components.PostAttachments/00/08/90/44/93/dotnetfx_cleanup_tool_2015_12_18.zip" -DL_SOURCE[1]="https://msdnshared.blob.core.windows.net/media/2017/05/dotnetfx_cleanup_tool.zip" +DL_SOURCE[1]="https://msdnshared.blob.core.windows.net/media/2018/05/dotnetfx_cleanup_tool.zip" DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="unzip" DL_EXTRACT_TO[1]="dotnet" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index acc2f1d..84c74a7 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -183,23 +183,23 @@ function create() { sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml sed -e 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml - if [ "$JRE9UPDATE" = "1" ]; then - mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/{x86,x64} - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*.exe - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/silent.bat - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*/jre.exe - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*/silent.bat - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/*.xml - mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml - #mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x86/silent.bat - #mv $INST_DIR/CLIENT_DATA/X86/jre9u${JRE9UVERSION}-b${JRE9BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x86/jre.exe - mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE9_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x64/silent.bat - mv $INST_DIR/CLIENT_DATA/X86/jre${JRE9UVERSION}-b${JRE9BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/x64/jre.exe - patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/check[@type='os']" - patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment ${JRE9UVERSION}" - patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='BUILD']/@value" "${JRE9VERSION}" + if [ "$JRE10UPDATE" = "1" ]; then + mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/{x86,x64} + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*.exe + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/silent.bat + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*/jre.exe + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*/silent.bat + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*.xml + mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml + #mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x86/silent.bat + #mv $INST_DIR/CLIENT_DATA/X86/JRE10u${JRE10UVERSION}-b${JRE10BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x86/jre.exe + mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x64/silent.bat + mv $INST_DIR/CLIENT_DATA/X86/jre${JRE10UVERSION}-b${JRE10BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x64/jre.exe + patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/check[@type='os']" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment ${JRE10UVERSION}" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/variable[@name='BUILD']/@value" "${JRE10VERSION}" fi - sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml + sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml # ========================================================================================================== # Update Flash @@ -351,17 +351,17 @@ function create() { sed -e 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat - echo "if exist \"%PROGRAMFILES%\Java\jre9\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre9\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat - echo "if exist \"%PROGRAMFILES(x86)%\Java\jre9\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre9\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat + echo "if exist \"%PROGRAMFILES%\Java\jre10\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre10\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat + echo "if exist \"%PROGRAMFILES(x86)%\Java\jre10\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre10\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat - echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat - echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat - echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat + echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat + echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat + echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/disable.bat - sed -e 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml - tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat + sed -e 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml + tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml # ========================================================================================================== # Disable Flash Update Check diff --git a/dotnetfx_cleanup_tool-2.4.5.1.zip.sha1sum b/dotnetfx_cleanup_tool-2.4.5.1.zip.sha1sum deleted file mode 100644 index 9fc3323..0000000 --- a/dotnetfx_cleanup_tool-2.4.5.1.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -da39a3ee5e6b4b0d3255bfef95601890afd80709 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/dotnetfx_cleanup_tool-2.4.5.1.zip diff --git a/dotnetfx_cleanup_tool-2.4.6.1.zip.sha1sum b/dotnetfx_cleanup_tool-2.4.6.1.zip.sha1sum new file mode 100644 index 0000000..53d1b37 --- /dev/null +++ b/dotnetfx_cleanup_tool-2.4.6.1.zip.sha1sum @@ -0,0 +1 @@ +2b70dcb8868242e5085c29ed52b13d23c1897cf7 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/dotnetfx_cleanup_tool-2.4.6.1.zip diff --git a/install_flash_player-29.0.0.113.exe.sha1sum b/install_flash_player-29.0.0.113.exe.sha1sum deleted file mode 100644 index 22bdb4d..0000000 --- a/install_flash_player-29.0.0.113.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -c31333cc1a6a34054f1283148900b5d81f5c9bdc /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/install_flash_player-29.0.0.113.exe diff --git a/install_flash_player-30.0.0.113.exe.sha1sum b/install_flash_player-30.0.0.113.exe.sha1sum new file mode 100644 index 0000000..1de7aa6 --- /dev/null +++ b/install_flash_player-30.0.0.113.exe.sha1sum @@ -0,0 +1 @@ +721c1f89ab3941f40bed5985562cb140dd48eb87 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/install_flash_player-30.0.0.113.exe diff --git a/install_flash_player_ax-29.0.0.113.exe.sha1sum b/install_flash_player_ax-29.0.0.113.exe.sha1sum deleted file mode 100644 index 865621b..0000000 --- a/install_flash_player_ax-29.0.0.113.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8343139f92b1917ad19da6488129cb74cf2b0fc3 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/install_flash_player_ax-29.0.0.113.exe diff --git a/install_flash_player_ax-30.0.0.113.exe.sha1sum b/install_flash_player_ax-30.0.0.113.exe.sha1sum new file mode 100644 index 0000000..fae49a2 --- /dev/null +++ b/install_flash_player_ax-30.0.0.113.exe.sha1sum @@ -0,0 +1 @@ +cd66c7c831ef216e92ee628b0db817233a98d893 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/install_flash_player_ax-30.0.0.113.exe diff --git a/jre10.0.1-b10-x64.exe.sha1sum b/jre10.0.1-b10-x64.exe.sha1sum new file mode 100644 index 0000000..2b53f0e --- /dev/null +++ b/jre10.0.1-b10-x64.exe.sha1sum @@ -0,0 +1 @@ +42ca368b14b6a2461120dd8cd445b71adc7add48 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre10.0.1-b10-x64.exe diff --git a/jre10.0.1-b10-x86.exe.sha1sum b/jre10.0.1-b10-x86.exe.sha1sum new file mode 100644 index 0000000..5f36a5d --- /dev/null +++ b/jre10.0.1-b10-x86.exe.sha1sum @@ -0,0 +1 @@ +42ca368b14b6a2461120dd8cd445b71adc7add48 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre10.0.1-b10-x86.exe diff --git a/jre8u162-b12-x64.exe.sha1sum b/jre8u162-b12-x64.exe.sha1sum deleted file mode 100644 index 6062717..0000000 --- a/jre8u162-b12-x64.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -f3cb0f6e2773b4885e436986a67f3aea48a28dbb /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre8u162-b12-x64.exe diff --git a/jre8u162-b12-x86.exe.sha1sum b/jre8u162-b12-x86.exe.sha1sum deleted file mode 100644 index e19c2e0..0000000 --- a/jre8u162-b12-x86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -c05edd782b1d63d690a94afb62b2f3ccde426a18 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre8u162-b12-x86.exe diff --git a/jre8u172-b11-x64.exe.sha1sum b/jre8u172-b11-x64.exe.sha1sum new file mode 100644 index 0000000..af6e034 --- /dev/null +++ b/jre8u172-b11-x64.exe.sha1sum @@ -0,0 +1 @@ +dfb036066e654833234a5c61526d3a15c0475f15 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre8u172-b11-x64.exe diff --git a/jre8u172-b11-x86.exe.sha1sum b/jre8u172-b11-x86.exe.sha1sum new file mode 100644 index 0000000..ba96297 --- /dev/null +++ b/jre8u172-b11-x86.exe.sha1sum @@ -0,0 +1 @@ +5d76e4f5c52403312d63cd94ea1e6213534e20b1 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre8u172-b11-x86.exe diff --git a/jre9.0.4-b11-x64.exe.sha1sum b/jre9.0.4-b11-x64.exe.sha1sum deleted file mode 100644 index 16435a1..0000000 --- a/jre9.0.4-b11-x64.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -27b83f9f26649898a5271dc765c7c0aab80807f1 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre9.0.4-b11-x64.exe diff --git a/jre9.0.4-b11-x86.exe.sha1sum b/jre9.0.4-b11-x86.exe.sha1sum deleted file mode 100644 index 3d181ca..0000000 --- a/jre9.0.4-b11-x86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -27b83f9f26649898a5271dc765c7c0aab80807f1 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/jre9.0.4-b11-x86.exe diff --git a/sw_lic_full_installer-12.3.2.202.msi.sha1sum b/sw_lic_full_installer-12.3.2.202.msi.sha1sum deleted file mode 100644 index 00404dd..0000000 --- a/sw_lic_full_installer-12.3.2.202.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -043a697eed94fc6c6446a9a3d6f4eb5c30c64461 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/sw_lic_full_installer-12.3.2.202.msi diff --git a/sw_lic_full_installer-12.3.4.204.msi.sha1sum b/sw_lic_full_installer-12.3.4.204.msi.sha1sum new file mode 100644 index 0000000..ac4f7fa --- /dev/null +++ b/sw_lic_full_installer-12.3.4.204.msi.sha1sum @@ -0,0 +1 @@ +1774dc49de3858966503305aa78f0816c9495e65 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/sw_lic_full_installer-12.3.4.204.msi diff --git a/uninstall_flash_player-29.0.0.113.exe.sha1sum b/uninstall_flash_player-29.0.0.113.exe.sha1sum deleted file mode 100644 index da2f27b..0000000 --- a/uninstall_flash_player-29.0.0.113.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -6166fd140fa2b1c2cabeb1cd5d2569cb260d7366 /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/uninstall_flash_player-29.0.0.113.exe diff --git a/uninstall_flash_player-30.0.0.113.exe.sha1sum b/uninstall_flash_player-30.0.0.113.exe.sha1sum new file mode 100644 index 0000000..bbc7392 --- /dev/null +++ b/uninstall_flash_player-30.0.0.113.exe.sha1sum @@ -0,0 +1 @@ +a01ad0b0583814bc72cadd7f4e53aa3be23d9a80 /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/uninstall_flash_player-30.0.0.113.exe diff --git a/uninstall_shock_player-12.3.2.202.exe.sha1sum b/uninstall_shock_player-12.3.4.204.exe.sha1sum similarity index 51% rename from uninstall_shock_player-12.3.2.202.exe.sha1sum rename to uninstall_shock_player-12.3.4.204.exe.sha1sum index 30e5e23..5dfc39c 100644 --- a/uninstall_shock_player-12.3.2.202.exe.sha1sum +++ b/uninstall_shock_player-12.3.4.204.exe.sha1sum @@ -1 +1 @@ -4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario/.opsi-dist-cache/sereby.aio-2.4.5.1/X86/uninstall_shock_player-12.3.2.202.exe +4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/uninstall_shock_player-12.3.4.204.exe