diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index af69d3c..3549085 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -4,7 +4,6 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallMaintenance$ = "%ProgramFiles32Dir%\Mozilla Maintenance Service\Uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" @@ -29,11 +28,6 @@ if FileExists($UninstallProgram$) Winbatch_uninstall sub_check_exitcode endif -if FileExists($UninstallMaintenance$) - comment "Uninstall Maintenance found, starting uninstall" - Winbatch_maintenance_uninstall - sub_check_exitcode -endif comment "Delete files" Files_uninstall /32Bit @@ -44,9 +38,6 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_maintenance_uninstall] -"$UninstallMaintenance$" /S /v"qn" - [Winbatch_uninstall_old] "$UninstallProgramOld$" -ms diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 8ed57d7..5a8e7d9 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -8,7 +8,6 @@ requiredWinstVersion >= "4.11.2.6" DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ -DefVar $UninstallMaintenance$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index a41c36d..e1030f4 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -8,7 +8,6 @@ requiredWinstVersion >= "4.11.2.6" DefVar $UninstallProgram$ DefVar $UninstallProgramOld$ -DefVar $UninstallMaintenance$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$