add java v8 and .net for win8.x
This commit is contained in:
Mario Fetka
parent
0961a568bd
commit
3f6d50772c
|
|
@ -83,9 +83,14 @@ if ($sereby_silver$ = "reinstall")
|
|||
opsiservicecall_silver_uninstall
|
||||
Set $reboot$ = "true"
|
||||
endif
|
||||
if ($sereby_jre$ = "reinstall")
|
||||
if ($sereby_jre7$ = "reinstall")
|
||||
Dosbatch_jre_uninstall
|
||||
opsiservicecall_jre_uninstall
|
||||
opsiservicecall_jre7_uninstall
|
||||
Set $reboot$ = "true"
|
||||
endif
|
||||
if ($sereby_jre8$ = "reinstall")
|
||||
Dosbatch_jre_uninstall
|
||||
opsiservicecall_jre8_uninstall
|
||||
Set $reboot$ = "true"
|
||||
endif
|
||||
if ($sereby_AdobeShock$ = "reinstall")
|
||||
|
|
@ -240,7 +245,13 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
|
|||
"%opsiserviceUser%"
|
||||
]
|
||||
|
||||
[DosBatch_jre_uninstall]
|
||||
[DosBatch_jre7_uninstall]
|
||||
@echo off
|
||||
rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
|
||||
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
|
||||
cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
|
||||
|
||||
[DosBatch_jre8_uninstall]
|
||||
@echo off
|
||||
rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
|
||||
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@ endif
|
|||
if ($sereby_dotnet4.5.1$ = "install")
|
||||
DosInAnIcon_dotnet4.5.1_config
|
||||
endif
|
||||
if ($sereby_win8xdotnet3x$ = "install")
|
||||
DosInAnIcon_win8xdotnet3x_config
|
||||
endif
|
||||
if ($sereby_msjsharp$ = "install")
|
||||
DosInAnIcon_msjsharp_config
|
||||
endif
|
||||
|
|
@ -28,8 +31,11 @@ endif
|
|||
if ($sereby_silver$ = "install")
|
||||
DosInAnIcon_silver_config
|
||||
endif
|
||||
if ($sereby_jre$ = "install")
|
||||
DosInAnIcon_jre_config
|
||||
if ($sereby_jre7$ = "install")
|
||||
DosInAnIcon_jre7_config
|
||||
endif
|
||||
if ($sereby_jre8$ = "install")
|
||||
DosInAnIcon_jre8_config
|
||||
endif
|
||||
if ($sereby_AdobeShock$ = "install")
|
||||
DosInAnIcon_AdobeShock_config
|
||||
|
|
@ -88,6 +94,10 @@ xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG
|
|||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='net4.5.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_win8xdotnet3x_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='NetWin8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_msjsharp_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
|
@ -100,10 +110,14 @@ 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_jre_config]
|
||||
[DosInAnIcon_jre7_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='jre7']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_jre8_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='jre8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_AdobeShock_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='AdobeShock']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
|
|
|||
|
|
@ -16,14 +16,18 @@ DefVar $sereby_dotnet4.0$
|
|||
Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none")
|
||||
DefVar $sereby_dotnet4.5.1$
|
||||
Set $sereby_dotnet4.5.1$ = GetProductProperty("sereby_dotnet4.5.1", "install")
|
||||
DefVar $sereby_win8xdotnet3x$
|
||||
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
|
||||
DefVar $sereby_msjsharp$
|
||||
Set $sereby_msjsharp$ = GetProductProperty("sereby_msjsharp", "install")
|
||||
DefVar $sereby_msfsharp$
|
||||
Set $sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install")
|
||||
DefVar $sereby_silver$
|
||||
Set $sereby_silver$ = GetProductProperty("sereby_silver", "install")
|
||||
DefVar $sereby_jre$
|
||||
Set $sereby_jre$ = GetProductProperty("sereby_jre", "install")
|
||||
DefVar $sereby_jre7$
|
||||
Set $sereby_jre7$ = GetProductProperty("sereby_jre7", "install")
|
||||
DefVar $sereby_jre8$
|
||||
Set $sereby_jre8$ = GetProductProperty("sereby_jre8", "install")
|
||||
DefVar $sereby_AdobeShock$
|
||||
Set $sereby_AdobeShock$ = GetProductProperty("sereby_AdobeShock", "install")
|
||||
DefVar $sereby_basicruntimes$
|
||||
|
|
|
|||
22
OPSI/control
22
OPSI/control
|
|
@ -108,6 +108,15 @@ description: Install Microsoft Netframework 4.5.1
|
|||
values: ["install", "none", "reinstall"]
|
||||
default: ["install"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: sereby_win8xdotnet3x
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Install Microsoft Netframework 2 - 3.x
|
||||
values: ["install", "none", "reinstall"]
|
||||
default: ["install"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: sereby_msjsharp
|
||||
|
|
@ -137,13 +146,22 @@ default: ["install"]
|
|||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: sereby_jre
|
||||
name: sereby_jre7
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Install Java Runtime Environment
|
||||
description: Install Java 7 Runtime Environment
|
||||
values: ["install", "none", "reinstall"]
|
||||
default: ["install"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: sereby_jre8
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Install Java 8 Runtime Environment
|
||||
values: ["install", "none", "reinstall"]
|
||||
default: ["none"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: sereby_AdobeShock
|
||||
|
|
|
|||
|
|
@ -33,9 +33,13 @@ AIRVERSION="13.0.0.33"
|
|||
# Update Java
|
||||
# ==================================
|
||||
|
||||
JREUPDATE="1"
|
||||
JREUVERSION="51"
|
||||
JREVERSION="7.0.510.13"
|
||||
JRE7UPDATE="1"
|
||||
JRE7UVERSION="51"
|
||||
JRE7VERSION="7.0.510.13"
|
||||
|
||||
JRE8UPDATE="0"
|
||||
JRE8UVERSION="51"
|
||||
JRE8VERSION="8.0.510.13"
|
||||
|
||||
# ==================================
|
||||
# Update Adobe Flash
|
||||
|
|
@ -153,89 +157,99 @@ DL_ARCH[11]="X86"
|
|||
DL_EXTRACT_FORMAT[11]="7zip"
|
||||
DL_EXTRACT_TO[11]="7ZipSFX"
|
||||
|
||||
DL_FILE[12]="jre7u${JREUVERSION}-x86.exe"
|
||||
DL_FILE[12]="jre7u${JRE7UVERSION}-x86.exe"
|
||||
DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383"
|
||||
DL_ARCH[12]="X86"
|
||||
DL_WINST_NAME[12]=InstallJre32Exe
|
||||
DL_WINST_NAME[12]=Install7Jre32Exe
|
||||
|
||||
DL_FILE[13]="jre7u${JREUVERSION}-x64.exe"
|
||||
DL_FILE[13]="jre7u${JRE7UVERSION}-x64.exe"
|
||||
DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385"
|
||||
DL_ARCH[13]="X86"
|
||||
DL_WINST_NAME[13]=InstallJre64Exe
|
||||
DL_WINST_NAME[13]=Install7Jre64Exe
|
||||
|
||||
DL_FILE[14]="install_flash_player-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[14]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
|
||||
DL_FILE[14]="jre8u${JRE8UVERSION}-x86.exe"
|
||||
DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383"
|
||||
DL_ARCH[14]="X86"
|
||||
DL_WINST_NAME[14]=InstallFlashExe
|
||||
DL_WINST_NAME[14]=Install8Jre32Exe
|
||||
|
||||
DL_FILE[15]="install_flash_player_ax-${FLASHAXVERSION}.exe"
|
||||
DL_SOURCE[15]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHAXVERSION}/install_flash_player_ax.exe"
|
||||
DL_FILE[15]="jre8u${JRE8UVERSION}-x64.exe"
|
||||
DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385"
|
||||
DL_ARCH[15]="X86"
|
||||
DL_WINST_NAME[15]=InstallFlashIeExe
|
||||
DL_WINST_NAME[15]=InstallJ8re64Exe
|
||||
|
||||
DL_FILE[16]="sw_lic_full_installer-${SHOCKVERSION}.msi"
|
||||
DL_SOURCE[16]="http://ricktendo.info/Repack/sw_lic_full_installer.msi"
|
||||
#DL_SOURCE[16]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
|
||||
DL_FILE[16]="install_flash_player-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[16]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
|
||||
DL_ARCH[16]="X86"
|
||||
DL_WINST_NAME[16]=InstallShockMsi
|
||||
DL_WINST_NAME[16]=InstallFlashExe
|
||||
|
||||
DL_FILE[17]="Silverlight-${SILVERVERSION}.exe"
|
||||
DL_SOURCE[17]="http://download.microsoft.com/download/B/A/9/BA94BEC9-5DBC-4B50-BC2B-046A42399067/30214.00/Silverlight.exe"
|
||||
DL_FILE[17]="install_flash_player_ax-${FLASHAXVERSION}.exe"
|
||||
DL_SOURCE[17]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHAXVERSION}/install_flash_player_ax.exe"
|
||||
DL_ARCH[17]="X86"
|
||||
DL_WINST_NAME[17]=InstallSilver32Exe
|
||||
DL_WINST_NAME[17]=InstallFlashIeExe
|
||||
|
||||
DL_FILE[18]="Silverlight_x64-${SILVERVERSION}.exe"
|
||||
DL_SOURCE[18]="http://download.microsoft.com/download/B/A/9/BA94BEC9-5DBC-4B50-BC2B-046A42399067/30214.00/Silverlight_x64.exe"
|
||||
DL_FILE[18]="sw_lic_full_installer-${SHOCKVERSION}.msi"
|
||||
DL_SOURCE[18]="http://ricktendo.info/Repack/sw_lic_full_installer.msi"
|
||||
#DL_SOURCE[18]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
|
||||
DL_ARCH[18]="X86"
|
||||
DL_WINST_NAME[18]=InstallSilver64Exe
|
||||
DL_WINST_NAME[18]=InstallShockMsi
|
||||
|
||||
DL_FILE[19]="unlocker1.9.0-portable.zip"
|
||||
DL_SOURCE[19]="file:///home/mario/Downloads/unlocker1.9.0-portable.zip"
|
||||
DL_FILE[19]="Silverlight-${SILVERVERSION}.exe"
|
||||
DL_SOURCE[19]="http://download.microsoft.com/download/B/A/9/BA94BEC9-5DBC-4B50-BC2B-046A42399067/30214.00/Silverlight.exe"
|
||||
DL_ARCH[19]="X86"
|
||||
DL_EXTRACT_TO[19]="Unlocker"
|
||||
DL_EXTRACT_FORMAT[19]="7zip"
|
||||
DL_WINST_NAME[19]=InstallSilver32Exe
|
||||
|
||||
DL_FILE[20]="VBCFJRedist_AIO_x86_x64_${RICKTENDOAIO}.exe"
|
||||
DL_SOURCE[20]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
|
||||
DL_FILE[20]="Silverlight_x64-${SILVERVERSION}.exe"
|
||||
DL_SOURCE[20]="http://download.microsoft.com/download/B/A/9/BA94BEC9-5DBC-4B50-BC2B-046A42399067/30214.00/Silverlight_x64.exe"
|
||||
DL_ARCH[20]="X86"
|
||||
DL_WINST_NAME[20]=RicktendoAioExe
|
||||
DL_WINST_NAME[20]=InstallSilver64Exe
|
||||
|
||||
# The DL_FILE[21] - DL_FILE[22] is also used in the builder-target-cb.sh
|
||||
# if you change also change there
|
||||
DL_FILE[21]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_SOURCE[21]="http://ricktendo.info/Repack/dotNetFx40_Full_x86_x64_Slim.exe"
|
||||
DL_FILE[21]="unlocker1.9.0-portable.zip"
|
||||
DL_SOURCE[21]="file:///home/mario/Downloads/unlocker1.9.0-portable.zip"
|
||||
DL_ARCH[21]="X86"
|
||||
DL_WINST_NAME[21]=RicktendoNet40Exe
|
||||
DL_EXTRACT_TO[21]="Unlocker"
|
||||
DL_EXTRACT_FORMAT[21]="7zip"
|
||||
|
||||
DL_FILE[22]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
|
||||
DL_SOURCE[22]="http://ricktendo.info/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
|
||||
DL_FILE[22]="VBCFJRedist_AIO_x86_x64_${RICKTENDOAIO}.exe"
|
||||
DL_SOURCE[22]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
|
||||
DL_ARCH[22]="X86"
|
||||
DL_WINST_NAME[22]=RicktendoNet40Lang
|
||||
DL_WINST_NAME[22]=RicktendoAioExe
|
||||
|
||||
#DL_FILE[23]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_FILE[23]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe"
|
||||
# The DL_FILE[23] - DL_FILE[22] is also used in the builder-target-cb.sh
|
||||
# if you change also change there
|
||||
DL_FILE[23]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx40_Full_x86_x64_Slim.exe"
|
||||
DL_ARCH[23]="X86"
|
||||
DL_WINST_NAME[23]=Ricktendo45Exe
|
||||
DL_WINST_NAME[23]=RicktendoNet40Exe
|
||||
|
||||
DL_FILE[24]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
|
||||
DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z"
|
||||
DL_FILE[24]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
|
||||
DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
|
||||
DL_ARCH[24]="X86"
|
||||
DL_WINST_NAME[24]=RicktendoNet45Lang
|
||||
DL_WINST_NAME[24]=RicktendoNet40Lang
|
||||
|
||||
# General Runtimes
|
||||
DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z"
|
||||
DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
|
||||
#DL_FILE[25]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_FILE[25]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
|
||||
DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe"
|
||||
DL_ARCH[25]="X86"
|
||||
DL_EXTRACT_FORMAT[25]="7zip"
|
||||
DL_EXTRACT_TO[25]="Basic"
|
||||
DL_WINST_NAME[25]=Ricktendo45Exe
|
||||
|
||||
DL_FILE[26]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
|
||||
DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z"
|
||||
DL_ARCH[26]="X86"
|
||||
DL_WINST_NAME[26]=RicktendoNet45Lang
|
||||
|
||||
# General Runtimes
|
||||
DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
|
||||
DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
|
||||
DL_ARCH[26]="X86"
|
||||
DL_EXTRACT_FORMAT[26]="7zip"
|
||||
DL_EXTRACT_TO[26]="MSVC"
|
||||
DL_FILE[27]="geos_one-general-runtimes_${GENERALVERSION}.7z"
|
||||
DL_SOURCE[27]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
|
||||
DL_ARCH[27]="X86"
|
||||
DL_EXTRACT_FORMAT[27]="7zip"
|
||||
DL_EXTRACT_TO[27]="Basic"
|
||||
|
||||
# General Runtimes
|
||||
DL_FILE[28]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
|
||||
DL_SOURCE[28]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
|
||||
DL_ARCH[28]="X86"
|
||||
DL_EXTRACT_FORMAT[28]="7zip"
|
||||
DL_EXTRACT_TO[28]="MSVC"
|
||||
|
||||
##################
|
||||
### Uninstallers
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ function create() {
|
|||
echo "echo Installing .NET Framwork 2.0 - 3.5.1" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
sed 's/.*<\/settings>.*/\t<set component="NetWin8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Replace the General Runtimes with the Msi version off GeosOne
|
||||
|
|
@ -151,15 +152,25 @@ function create() {
|
|||
# Update Java
|
||||
# ==========================================================================================================
|
||||
|
||||
if [ "$JREUPDATE" = "1" ]; then
|
||||
if [ "$JRE7UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/*/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JREUVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JREVERSION}"
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JRE7UVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JRE7VERSION}"
|
||||
fi
|
||||
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
|
||||
if [ "$JRE8UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE8UVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE8UVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.exe
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 8 Update ${JRE8UVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='BUILD']/@value" "${JRE8VERSION}"
|
||||
fi
|
||||
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
sed 's/.*<\/settings>.*/\t<set component="jre8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Update Flash
|
||||
# ==========================================================================================================
|
||||
|
|
@ -342,6 +353,18 @@ function create() {
|
|||
sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
|
||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
|
||||
echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Disable Flash Update Check
|
||||
# ==========================================================================================================
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
0d3346f4c249d9443237205cc1c0dde1ef534874 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/jre8u51-x64.exe
|
||||
|
|
@ -0,0 +1 @@
|
|||
72aa32f97a0ddd306d436ac3f13fabb841b94a76 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/jre8u51-x86.exe
|
||||
Loading…
Reference in New Issue