go-opsi/sereby.aio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump and correct some small typos and problems

Browse Source
This commit is contained in:
Mario Fetka
2013-04-01 17:38:49 +02:00
parent 49c5eece42
commit c6a55f2553
7 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CLIENT_DATA/cleanup3264.ins
View File

@@ -33,6 +33,13 @@ if ($sereby_dotnet4.5$ = "uninstall")
opsiservicecall_dotnet4.5_uninstall
Set $reboot$ = "true"
endif
; a reboot is requred after the .net cleanup so that further uninstalls can work
if ($reboot$ = "true")
comment "uninstall done now force Reboot"
ExitWindows /ImmediateReboot
endif
if ($sereby_msjsharp$ = "uninstall")
Winbatch_msjsharp_uninstall
opsiservicecall_msjsharp_uninstall
@@ -82,6 +89,7 @@ if ($sereby_java_reinstall$ = "true")
Dosbatch_java_reinstall
endif
; and the final reboot after the uninstall is done
if ($reboot$ = "true")
comment "uninstall done now force Reboot"
ExitWindows /ImmediateReboot
@@ -95,7 +103,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet1.1",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -107,7 +115,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet2.0",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -119,7 +127,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet3.0",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -131,7 +139,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet3.5",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -143,7 +151,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet4.0",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -155,7 +163,7 @@ endif
"params": [
"$ProductId$",
"sereby_dotnet4.5",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -166,7 +174,7 @@ endif
"params": [
"$ProductId$",
"sereby_msjsharp",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -177,14 +185,14 @@ endif
"params": [
"$ProductId$",
"sereby_silver",
"installed",
"install",
"%opsiserviceUser%"
]
[DosBatch_jre_uninstall]
; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\"
; $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
@echo off
rem copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\"
rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly
[opsiservicecall_jre_uninstall]
@@ -192,7 +200,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /ke
"params": [
"$ProductId$",
"sereby_jre",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -207,7 +215,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"params": [
"$ProductId$",
"sereby_AdobeShock",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -218,7 +226,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"params": [
"$ProductId$",
"sereby_basicruntimes",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -229,7 +237,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"params": [
"$ProductId$",
"sereby_msdx9",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -240,7 +248,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"params": [
"$ProductId$",
"sereby_msdxm",
"installed",
"install",
"%opsiserviceUser%"
]
@@ -251,18 +259,19 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"params": [
"$ProductId$",
"sereby_msvc",
"installed",
"install",
"%opsiserviceUser%"
]
[Winbatch_AdobeFlash_uninstall]
$UninstallFlashExe$ -uninstall
[opsiservicecall_AdobeFlash_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_AdobeFlash",
"installed",
"install",
"%opsiserviceUser%"
]

10
CLIENT_DATA/setup3264.ins
View File

@@ -64,6 +64,11 @@ else
comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
if FileExists("%ScriptPath%\cleanup3264.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\cleanup3264.ins"
endif
if FileExists("%ScriptPath%\delsub3264.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub3264.ins"
@@ -125,7 +130,10 @@ else
comment "Create shortcuts"
LinkFolder_install
endif
comment "Reboot"
ExitWindows /Reboot
endif
[Dosbatch_install_dotNet8]