disable java reinstall not needed because patch-in-place was introduced in 6u10 and 7u3 the old releases will stay in the softwarelist but they are really the newest verison

This commit is contained in:
Mario Fetka 2013-04-05 20:37:00 +02:00
parent 81582510ab
commit c0645c1aaf
7 changed files with 5 additions and 20 deletions

View File

@ -113,9 +113,6 @@ if ($sereby_AdobeFlash$ = "reinstall")
opsiservicecall_AdobeFlash_uninstall opsiservicecall_AdobeFlash_uninstall
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
if ($sereby_java_reinstall$ = "true")
Dosbatch_java_reinstall
endif
; and the final reboot after the uninstall is done ; and the final reboot after the uninstall is done
if ($reboot$ = "true") if ($reboot$ = "true")
@ -232,10 +229,6 @@ cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /ke
"%opsiserviceUser%" "%opsiserviceUser%"
] ]
[Dosbatch_java_reinstall]
@echo off
cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
[Winbatch_AdobeShock_uninstall] [Winbatch_AdobeShock_uninstall]
[opsiservicecall_AdobeShock_uninstall] [opsiservicecall_AdobeShock_uninstall]

View File

@ -1,7 +1,5 @@
DefVar $MSVersion$ DefVar $MSVersion$
Set $MSVersion$ = GetMsVersionInfo Set $MSVersion$ = GetMsVersionInfo
DefVar $sereby_java_reinstall$
Set $sereby_java_reinstall$ = GetProductProperty("sereby_java_reinstall", "true")
DefVar $sereby_timer_value$ DefVar $sereby_timer_value$
Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "40") Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "40")
DefVar $sereby_timer_enabled$ DefVar $sereby_timer_enabled$

BIN
CLIENT_DATA/opsi-WinPKG.exe Normal file

Binary file not shown.

View File

@ -144,7 +144,7 @@ dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Insta
@echo off @echo off
%ScriptDrive% %ScriptDrive%
cd "%ScriptPath%\Install" cd "%ScriptPath%\Install"
WinPKG.exe opsi-WinPKG.exe
[Files_install_32] [Files_install_32]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir

View File

@ -54,15 +54,6 @@ description: Timer enabled
values: ["0", "1"] values: ["0", "1"]
default: ["1"] default: ["1"]
[ProductProperty]
type: unicode
name: sereby_java_reinstall
multivalue: False
editable: False
description: Remove all versions of Java and install the latest version (from sereby packet)
values: ["false", "true"]
default: ["true"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: sereby_dotnet1.1 name: sereby_dotnet1.1

View File

@ -93,6 +93,9 @@ function create() {
mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash
mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave
# move the opsi wrapper to the right dir (close the error window if nothing needs to be done)
mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/
# delete the temp directory # delete the temp directory
rm -rf $INST_DIR/CLIENT_DATA/X86 rm -rf $INST_DIR/CLIENT_DATA/X86
} }

BIN
opsi-WinPKG.au3 Normal file

Binary file not shown.