move the uninstall section to once script and create new once entries for all the parts of sereby package

This commit is contained in:
Mario Fetka 2013-03-17 08:58:03 +01:00
parent 8bd69fd16d
commit 4efa646091
7 changed files with 380 additions and 155 deletions

View File

@ -1,11 +1,28 @@
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
if FileExists($IniFile32$)
Set $OnceUninstallDone$ = GetValueFromInifile($IniFile32$,"COMMON","OnceUninstallDone","false")
endif
endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
if FileExists($IniFile64$)
Set $OnceUninstallDone$ = GetValueFromInifile($IniFile64$,"COMMON","OnceUninstallDone","false")
endif
endif
DefVar $MSVersion$ DefVar $MSVersion$
Set $MSVersion$ = GetMsVersionInfo Set $MSVersion$ = GetMsVersionInfo
DefVar$timer_value$ DefVar $timer_value$
Set $timer_value$ = GetProductProperty("timer_value", "40") Set $timer_value$ = GetProductProperty("timer_value", "40")
DefVar$timer_enabled$ DefVar $timer_enabled$
Set$timer_enabled$ = GetProductProperty("timer_enabled", "1") Set $timer_enabled$ = GetProductProperty("timer_enabled", "1")
DefVar $dotnet1.1$ DefVar $dotnet1.1$
Set $dotnet1.1$ = GetProductProperty("dotnet1.1", "install") Set $dotnet1.1$ = GetProductProperty("dotnet1.1", "install")
DefVar $dotnet2.0$ DefVar $dotnet2.0$
@ -39,187 +56,218 @@ Set $AdobeFlash$ = GetProductProperty("AdobeFlash", "install")
DefVar $once_dotnet1.1$
Set $once_dotnet1.1$ = GetProductProperty("once_dotnet1.1", "uninstall")
DefVar $once_dotnet2.0$
Set $once_dotnet2.0$ = GetProductProperty("once_dotnet2.0", "uninstall")
DefVar $once_dotnet3.0$
Set $once_dotnet3.0$ = GetProductProperty("once_dotnet3.0", "uninstall")
DefVar $once_dotnet3.5$
Set $once_dotnet3.5$ = GetProductProperty("once_dotnet3.5", "nninstall")
DefVar $once_dotnet4.0$
Set $once_dotnet4.0$ = GetProductProperty("once_dotnet4.0", "uninstall")
DefVar $once_dotnet4.5$
Set $once_dotnet4.5$ = GetProductProperty("once_dotnet4.5", "uninstall")
DefVar $once_msjsharp$
Set $once_msjsharp$ = GetProductProperty("once_msjsharp", "uninstall")
DefVar $once_silver$
Set $once_silver$ = GetProductProperty("once_silver", "uninstall")
DefVar $once_jre7$
Set $once_jre7$ = GetProductProperty("once_jre7", "uninstall")
DefVar $once_AdobeShock$
Set $once_AdobeShock$ = GetProductProperty("once_AdobeShock", "uninstall")
DefVar $once_basicruntimes$
Set $once_basicruntimes$ = GetProductProperty("once_basicruntimes", "uninstall")
DefVar $once_msdx9$
Set $once_msdx9$ = GetProductProperty("once_msdx9", "uninstall")
DefVar $once_msdxm$
Set $once_msdxm$ = GetProductProperty("once_msdxm", "uninstall")
DefVar $once_msvc$
Set $once_msvc$ = GetProductProperty("once_msvc", "uninstall")
DefVar $once_AdobeFlash$
Set $once_AdobeFlash$ = GetProductProperty("once_AdobeFlash", "uninstall")
Winpatch_init_config
if getValue("lastactionrequest", getProductMap) = "once"
if ($OnceUninstallDone$ = "false")
if ($once_dotnet1.1$ = "uninstall")
Winbatch_dotnet1.1_uninstall
endif
if ($once_dotnet2.0$ = "uninstall")
Winbatch_dotnet2.0_uninstall
endif
if ($once_dotnet3.0$ = "uninstall")
Winbatch_dotnet3.0_uninstall
endif
if ($once_dotnet3.5$ = "uninstall")
Winbatch_dotnet3.5_uninstall
endif
if ($once_dotnet4.0$ = "uninstall")
Winbatch_dotnet4.0_uninstall
endif
if ($once_dotnet4.5$ = "uninstall")
Winbatch_dotnet4.5_uninstall
endif
if ($once_msjsharp$ = "uninstall")
Winbatch_msjsharp_uninstall
endif
if ($once_silver$ = "uninstall")
Winbatch_silver_uninstall
endif
if ($once_jre7$ = "uninstall")
Winbatch_jre7_uninstall
endif
if ($once_AdobeShock$ = "uninstall")
Winbatch_AdobeShock_uninstall
endif
if ($once_basicruntimes$ = "uninstall")
Winbatch_basicruntimes_uninstall
endif
if ($once_msdx9$ = "uninstall")
Winbatch_msdx9_uninstall
endif
if ($once_msdxm$ = "uninstall")
Winbatch_msdxm_uninstall
endif
if ($once_msvc$ = "uninstall")
Winbatch_msvc_uninstall
endif
if ($once_AdobeFlash$ = "uninstall")
Winbatch_AdobeFlash_uninstall
endif
if FileExists($IniFile32$)
inifile $IniFile32$ [COMMON] OnceUninstallDone=true
endif
if FileExists($IniFile64$)
inifile $IniFile64$ [COMMON] OnceUninstallDone=true
endif
comment "uninstall done now force Reboot"
ExitWindows /ImmediateReboot
endif
endif
Winbatch_init_config
if ($dotnet1.1$ = "install") if ($dotnet1.1$ = "install")
Winpatch_dotnet1.1_config Winbatch_dotnet1.1_config
endif endif
if ($dotnet1.1$ = "uninstall")
Winbatch_dotnet1.1_uninstall
endif
if ($dotnet2.0$ = "install") if ($dotnet2.0$ = "install")
Winpatch_dotnet2.0_config Winbatch_dotnet2.0_config
endif endif
if ($dotnet2.0$ = "uninstall")
Winbatch_dotnet2.0_uninstall
endif
if ($dotnet3.0$ = "install") if ($dotnet3.0$ = "install")
Winpatch_dotnet3.0_config Winbatch_dotnet3.0_config
endif endif
if ($dotnet3.0$ = "uninstall")
Winbatch_dotnet3.0_uninstall
endif
if ($dotnet3.5$ = "install") if ($dotnet3.5$ = "install")
Winpatch_dotnet3.5_config Winbatch_dotnet3.5_config
endif endif
if ($dotnet3.5$ = "uninstall")
Winbatch_dotnet3.5_uninstall
endif
if ($dotnet4.0$ = "install") if ($dotnet4.0$ = "install")
Winpatch_dotnet4.0_config Winbatch_dotnet4.0_config
endif endif
if ($dotnet4.0$ = "uninstall")
Winbatch_dotnet4.0_uninstall
endif
if ($dotnet4.5$ = "install") if ($dotnet4.5$ = "install")
Winpatch_dotnet4.5_config Winbatch_dotnet4.5_config
endif endif
if ($dotnet4.5$ = "uninstall")
Winbatch_dotnet4.5_uninstall
endif
if ($msjsharp$ = "install") if ($msjsharp$ = "install")
Winpatch_msjsharp_config Winbatch_msjsharp_config
endif endif
if ($msjsharp$ = "uninstall")
Winbatch_msjsharp_uninstall
endif
if ($silver$ = "install") if ($silver$ = "install")
Winpatch_silver_config Winbatch_silver_config
endif endif
if ($silver$ = "uninstall")
Winbatch_silver_uninstall
endif
if ($jre7$ = "install") if ($jre7$ = "install")
Winpatch_jre7_config Winbatch_jre7_config
endif endif
if ($jre7$ = "uninstall")
Winbatch_jre7_uninstall
endif
if ($AdobeShock$ = "install") if ($AdobeShock$ = "install")
Winpatch_AdobeShock_config Winbatch_AdobeShock_config
endif endif
if ($AdobeShock$ = "uninstall")
Winbatch_AdobeShock_uninstall
endif
if ($basicruntimes$ = "install") if ($basicruntimes$ = "install")
Winpatch_basicruntimes_config Winbatch_basicruntimes_config
endif endif
if ($basicruntimes$ = "uninstall")
Winbatch_basicruntimes_uninstall
endif
if ($msdx9$ = "install") if ($msdx9$ = "install")
Winpatch_msdx9_config Winbatch_msdx9_config
endif endif
if ($msdx9$ = "uninstall")
Winbatch_msdx9_uninstall
endif
if ($msdxm$ = "install") if ($msdxm$ = "install")
Winpatch_msdxm_config Winbatch_msdxm_config
endif endif
if ($msdxm$ = "uninstall")
Winbatch_msdxm_uninstall
endif
if ($msvc$ = "install") if ($msvc$ = "install")
Winpatch_msvc_config Winbatch_msvc_config
endif endif
if ($msvc$ = "uninstall")
Winbatch_msvc_uninstall
endif
if ($AdobeFlash$ = "install") if ($AdobeFlash$ = "install")
Winpatch_AdobeFlash_config Winbatch_AdobeFlash_config
endif
if ($AdobeFlash$ = "uninstall")
Winbatch_AdobeFlash_uninstall
endif endif
Dospatch_finish_config Winbatch_finish_config
[Winpatch_init_config] [Winbatch_init_config]
vcopy "%ScriptPath%\Config\WinPKG.xml" "$LogDir$" copy "%ScriptPath%\Config\WinPKG.xml" "$LogDir$"
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@value=40]/@value" -v $timer_value$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/timer[@value=40]/@value" -v $timer_value$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=1]/@enabled" -v $timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet1.1_config] [Winbatch_dotnet1.1_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net1.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net1.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet2.0_config] [Winbatch_dotnet2.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net2.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net2.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet3.0_config] [Winbatch_dotnet3.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net3.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net3.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet3.5_config] [Winbatch_dotnet3.5_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet4.0_config] [Winbatch_dotnet4.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet4.5_config] [Winbatch_dotnet4.5_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_msjsharp_config] [Winbatch_msjsharp_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" 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" xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_silver_config] [Winbatch_silver_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" 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" xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_jre7_config] [Winbatch_jre7_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" 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" xml ed -O -u "/settings/set[@component='jre7']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_AdobeShock_config] [Winbatch_AdobeShock_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" 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" xml ed -O -u "/settings/set[@component='AdobeShock']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_basicruntimes_config] [Winbatch_basicruntimes_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_msdx9_config] [Winbatch_msdx9_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_msdxm_config] [Winbatch_msdxm_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_msvc_config] [Winbatch_msvc_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msvc']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='msvc']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_AdobeFlash_config] [Winbatch_AdobeFlash_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='AdobeFlash']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='AdobeFlash']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Dospatch_finish_config] [Winbatch_finish_config]
move $LogDir$\WinPKG.xml "%System%" move $LogDir$\WinPKG.xml "%System%"
del $LogDir$\WinPKG.xml.old del $LogDir$\WinPKG.xml.old
@ -248,8 +296,9 @@ del $LogDir$\WinPKG.xml.old
[Winbatch_silver_uninstall] [Winbatch_silver_uninstall]
[Winbatch_jre7_uninstall] [Winbatch_jre7_uninstall]
vcopy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" ; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\"
$LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS ; $LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS
cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly
[Winbatch_AdobeShock_uninstall] [Winbatch_AdobeShock_uninstall]

View File

@ -66,9 +66,6 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Files_uninstall_64 /64Bit Files_uninstall_64 /64Bit
comment "Cleanup registry" comment "Cleanup registry"
Registry_uninstall /64Bit Registry_uninstall /64Bit
comment "Reboot"
ExitWindows /ImmediateReboot
endif endif
comment "Delete program shortcuts" comment "Delete program shortcuts"

View File

@ -24,6 +24,7 @@ DefVar $INST_architecture$
DefVar $OLD_VERSION$ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $OnceUninstallDone$
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -53,6 +54,8 @@ Set $InstallDir64$ = "%ProgramFiles64Dir%\Sereby AIO"
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
@ -67,10 +70,12 @@ else
Sub "%ScriptPath%\control3264.ins" Sub "%ScriptPath%\control3264.ins"
endif endif
if not (getValue("lastactionrequest", getProductMap) = "once")
if FileExists("%ScriptPath%\delsub3264.ins") if FileExists("%ScriptPath%\delsub3264.ins")
comment "Start uninstall sub section" comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub3264.ins" Sub "%ScriptPath%\delsub3264.ins"
endif endif
endif
comment "installing" comment "installing"
@ -78,7 +83,8 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program" comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%" ChangeDirectory "%SCRIPTPATH%"
Winbatch_install_32 Winbatch_jre_uninstall
Dosbatch_install_32
Sub_check_exitcode Sub_check_exitcode
comment "Copy files" comment "Copy files"
Files_install_32 /32Bit Files_install_32 /32Bit
@ -92,7 +98,8 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program" comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%" ChangeDirectory "%SCRIPTPATH%"
Winbatch_install_64 Winbatch_jre_uninstall
Dosbatch_install_64
Sub_check_exitcode Sub_check_exitcode
comment "Copy files" comment "Copy files"
Files_install_64 /64Bit Files_install_64 /64Bit
@ -103,11 +110,15 @@ else
endif endif
comment "Reboot" comment "Reboot"
ExitWindows /ImmediateReboot ExitWindows /Reboot
endif endif
[Winbatch_install_32] [Dosbatch_install_32]
"%ScriptPath%\Install\WinPKG.exe" @echo off
%ScriptDrive%
cd "%ScriptPath%\Install"
inifile $IniFile32$ [COMMON] OnceUninstallDone=false
WinPKG.exe
[Files_install_32] [Files_install_32]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
@ -117,8 +128,12 @@ copy "$IniCfgFile$" "$InstallDir32$"
; ;
copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir32$" copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir32$"
[Winbatch_install_64] [Dosbatch_install_64]
"%ScriptPath%\Install\WinPKG.exe" @echo off
%ScriptDrive%
cd "%ScriptPath%\Install"
inifile $IniFile64$ [COMMON] OnceUninstallDone=false
WinPKG.exe
[Files_install_64] [Files_install_64]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir

View File

@ -25,6 +25,7 @@ DefVar $INST_architecture$
DefVar $OLD_VERSION$ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $OnceUninstallDone$
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -50,16 +51,13 @@ Set $InstallDir64$ = "%ProgramFiles64Dir%\Sereby AIO"
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
include_insert "control3264.ins"
comment "Show product picture" comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
Message "Uninstalling " + $ProductId$ + " ..." Message "Uninstalling " + $ProductId$ + " ..."
if FileExists("%ScriptPath%\control3264.ins")
comment "Start config sub section"
Sub "%ScriptPath%\control3264.ins"
endif
if FileExists("%ScriptPath%\delsub3264.ins") if FileExists("%ScriptPath%\delsub3264.ins")
comment "Start uninstall sub section" comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub3264.ins" Sub "%ScriptPath%\delsub3264.ins"

View File

@ -17,7 +17,7 @@ setupScript: setup3264.ins
uninstallScript: uninstall3264.ins uninstallScript: uninstall3264.ins
updateScript: updateScript:
alwaysScript: alwaysScript:
onceScript: onceScript: setup3264.ins
customScript: customScript:
userLoginScript: userLoginScript:
@ -38,7 +38,7 @@ requirementType: before
[ProductDependency] [ProductDependency]
action: setup action: setup
requiredProduct: kliu.vcopy requiredProduct: horstmuc.inifile
requiredStatus: installed requiredStatus: installed
requirementType: before requirementType: before
@ -60,13 +60,15 @@ description: Timer enabled
values: ["0", "1"] values: ["0", "1"]
default: ["1"] default: ["1"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: dotnet1.1 name: dotnet1.1
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 1.1 description: Install Microsoft Netframework 1.1
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -75,7 +77,7 @@ name: dotnet2.0
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 2.0 description: Install Microsoft Netframework 2.0
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -84,7 +86,7 @@ name: dotnet3.0
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 3.0 description: Install Microsoft Netframework 3.0
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -93,7 +95,7 @@ name: dotnet3.5
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 3.5 description: Install Microsoft Netframework 3.5
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -102,7 +104,7 @@ name: dotnet4.0
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 4.0 description: Install Microsoft Netframework 4.0
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -111,7 +113,7 @@ name: dotnet4.5
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 4.5 description: Install Microsoft Netframework 4.5
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -120,7 +122,7 @@ name: msjsharp
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Visual J-Sharp 2.0 SE description: Install Microsoft Visual J-Sharp 2.0 SE
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -129,7 +131,7 @@ name: silver
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Silverlight 5 description: Install Microsoft Silverlight 5
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -138,7 +140,7 @@ name: jre7
multivalue: False multivalue: False
editable: False editable: False
description: Install Java Runtime Environment 7 description: Install Java Runtime Environment 7
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -147,7 +149,7 @@ name: AdobeShock
multivalue: False multivalue: False
editable: False editable: False
description: Install Adobe Shockwave Player 11.6 description: Install Adobe Shockwave Player 11.6
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -156,7 +158,7 @@ name: basicruntimes
multivalue: False multivalue: False
editable: False editable: False
description: Install Basic Runtimes description: Install Basic Runtimes
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -165,7 +167,7 @@ name: msdx9
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft DirectX 9.0c Redistributable description: Install Microsoft DirectX 9.0c Redistributable
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -174,7 +176,7 @@ name: msdxm
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft DirectX for Managed Code description: Install Microsoft DirectX for Managed Code
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -183,7 +185,7 @@ name: msvc
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Visual C++ Runtimes description: Install Microsoft Visual C++ Runtimes
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty] [ProductProperty]
@ -192,6 +194,158 @@ name: AdobeFlash
multivalue: False multivalue: False
editable: False editable: False
description: Adobe Flash Player description: Adobe Flash Player
values: ["install", "none", "uninstall"] values: ["install", "none"]
default: ["install"] default: ["install"]
[ProductProperty]
type: unicode
name: once_dotnet1.1
multivalue: False
editable: False
description: Install Microsoft Netframework 1.1
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_dotnet2.0
multivalue: False
editable: False
description: Install Microsoft Netframework 2.0
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_dotnet3.0
multivalue: False
editable: False
description: Install Microsoft Netframework 3.0
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_dotnet3.5
multivalue: False
editable: False
description: Install Microsoft Netframework 3.5
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_dotnet4.0
multivalue: False
editable: False
description: Install Microsoft Netframework 4.0
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_dotnet4.5
multivalue: False
editable: False
description: Install Microsoft Netframework 4.5
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_msjsharp
multivalue: False
editable: False
description: Install Microsoft Visual J-Sharp 2.0 SE
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_silver
multivalue: False
editable: False
description: Install Microsoft Silverlight 5
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_jre7
multivalue: False
editable: False
description: Install Java Runtime Environment 7
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_AdobeShock
multivalue: False
editable: False
description: Install Adobe Shockwave Player 11.6
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_basicruntimes
multivalue: False
editable: False
description: Install Basic Runtimes
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_msdx9
multivalue: False
editable: False
description: Install Microsoft DirectX 9.0c Redistributable
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_msdxm
multivalue: False
editable: False
description: Install Microsoft DirectX for Managed Code
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_msvc
multivalue: False
editable: False
description: Install Microsoft Visual C++ Runtimes
values: ["none", "uninstall"]
default: ["none"]
[ProductProperty]
type: unicode
name: once_AdobeFlash
multivalue: False
editable: False
description: Adobe Flash Player
values: ["none", "uninstall"]
default: ["none"]

View File

@ -63,6 +63,9 @@ DL_ARCH[6]="X86"
DL_WINST_NAME[6]=UninstallShockExe DL_WINST_NAME[6]=UninstallShockExe
##################
### Compat Opsi Template entries
##################
OPSI_INI_SECTION[0]="X86" OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="UninstallProg32" OPSI_INI_OPTION[0]="UninstallProg32"
@ -71,3 +74,12 @@ OPSI_INI_VALUE[0]="WinPKG.exe"
OPSI_INI_SECTION[1]="X86_64" OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="UninstallProg64" OPSI_INI_OPTION[1]="UninstallProg64"
OPSI_INI_VALUE[1]="WinPKG.exe" OPSI_INI_VALUE[1]="WinPKG.exe"
##################
### set sane default for once uninstall functionality
##################
OPSI_INI_SECTION[1]="COMMON"
OPSI_INI_OPTION[1]="OnceUninstallDone"
OPSI_INI_VALUE[1]="false"

View File

@ -40,7 +40,7 @@ function create() {
# rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Shockwave/* $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Shockwave/* $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave
# sed everything to disabled # sed everything to disabled
sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" $INST_DIR/CLIENT_DATA/X86/winpkg/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" $INST_DIR/CLIENT_DATA/X86/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
# move the uninstallers in place (directory layout like the sereby package) # move the uninstallers in place (directory layout like the sereby package)
mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE