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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

285
CLIENT_DATA/control3264.ins
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$
Set $MSVersion$ = GetMsVersionInfo
DefVar$timer_value$
Set $timer_value$ = GetProductProperty("timer_value", "40")
DefVar$timer_enabled$
Set$timer_enabled$ = GetProductProperty("timer_enabled", "1")
DefVar $timer_value$
Set $timer_value$ = GetProductProperty("timer_value", "40")
DefVar $timer_enabled$
Set $timer_enabled$ = GetProductProperty("timer_enabled", "1")
DefVar $dotnet1.1$
Set $dotnet1.1$ = GetProductProperty("dotnet1.1", "install")
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")
Winpatch_dotnet1.1_config
Winbatch_dotnet1.1_config
endif
if ($dotnet1.1$ = "uninstall")
Winbatch_dotnet1.1_uninstall
endif
if ($dotnet2.0$ = "install")
Winpatch_dotnet2.0_config
Winbatch_dotnet2.0_config
endif
if ($dotnet2.0$ = "uninstall")
Winbatch_dotnet2.0_uninstall
endif
if ($dotnet3.0$ = "install")
Winpatch_dotnet3.0_config
Winbatch_dotnet3.0_config
endif
if ($dotnet3.0$ = "uninstall")
Winbatch_dotnet3.0_uninstall
endif
if ($dotnet3.5$ = "install")
Winpatch_dotnet3.5_config
Winbatch_dotnet3.5_config
endif
if ($dotnet3.5$ = "uninstall")
Winbatch_dotnet3.5_uninstall
endif
if ($dotnet4.0$ = "install")
Winpatch_dotnet4.0_config
Winbatch_dotnet4.0_config
endif
if ($dotnet4.0$ = "uninstall")
Winbatch_dotnet4.0_uninstall
endif
if ($dotnet4.5$ = "install")
Winpatch_dotnet4.5_config
Winbatch_dotnet4.5_config
endif
if ($dotnet4.5$ = "uninstall")
Winbatch_dotnet4.5_uninstall
endif
if ($msjsharp$ = "install")
Winpatch_msjsharp_config
Winbatch_msjsharp_config
endif
if ($msjsharp$ = "uninstall")
Winbatch_msjsharp_uninstall
endif
if ($silver$ = "install")
Winpatch_silver_config
Winbatch_silver_config
endif
if ($silver$ = "uninstall")
Winbatch_silver_uninstall
endif
if ($jre7$ = "install")
Winpatch_jre7_config
Winbatch_jre7_config
endif
if ($jre7$ = "uninstall")
Winbatch_jre7_uninstall
endif
if ($AdobeShock$ = "install")
Winpatch_AdobeShock_config
Winbatch_AdobeShock_config
endif
if ($AdobeShock$ = "uninstall")
Winbatch_AdobeShock_uninstall
endif
if ($basicruntimes$ = "install")
Winpatch_basicruntimes_config
Winbatch_basicruntimes_config
endif
if ($basicruntimes$ = "uninstall")
Winbatch_basicruntimes_uninstall
endif
if ($msdx9$ = "install")
Winpatch_msdx9_config
Winbatch_msdx9_config
endif
if ($msdx9$ = "uninstall")
Winbatch_msdx9_uninstall
endif
if ($msdxm$ = "install")
Winpatch_msdxm_config
Winbatch_msdxm_config
endif
if ($msdxm$ = "uninstall")
Winbatch_msdxm_uninstall
endif
if ($msvc$ = "install")
Winpatch_msvc_config
Winbatch_msvc_config
endif
if ($msvc$ = "uninstall")
Winbatch_msvc_uninstall
endif
if ($AdobeFlash$ = "install")
Winpatch_AdobeFlash_config
endif
if ($AdobeFlash$ = "uninstall")
Winbatch_AdobeFlash_uninstall
Winbatch_AdobeFlash_config
endif
Dospatch_finish_config
Winbatch_finish_config
[Winpatch_init_config]
vcopy "%ScriptPath%\Config\WinPKG.xml" "$LogDir$"
[Winbatch_init_config]
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"
vcopy "$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"
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[Winpatch_dotnet1.1_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet1.1_config]
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"
[Winpatch_dotnet2.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet2.0_config]
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"
[Winpatch_dotnet3.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet3.0_config]
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"
[Winpatch_dotnet3.5_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet3.5_config]
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"
[Winpatch_dotnet4.0_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet4.0_config]
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"
[Winpatch_dotnet4.5_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_dotnet4.5_config]
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"
[Winpatch_msjsharp_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_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"
[Winpatch_silver_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_silver_config]
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"
[Winpatch_jre7_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_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"
[Winpatch_AdobeShock_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_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"
[Winpatch_basicruntimes_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_basicruntimes_config]
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"
[Winpatch_msdx9_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_msdx9_config]
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"
[Winpatch_msdxm_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_msdxm_config]
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"
[Winpatch_msvc_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_msvc_config]
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"
[Winpatch_AdobeFlash_config]
vcopy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
[Winbatch_AdobeFlash_config]
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"
[Dospatch_finish_config]
[Winbatch_finish_config]
move $LogDir$\WinPKG.xml "%System%"
del $LogDir$\WinPKG.xml.old
@@ -248,8 +296,9 @@ del $LogDir$\WinPKG.xml.old
[Winbatch_silver_uninstall]
[Winbatch_jre7_uninstall]
vcopy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\"
$LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS
; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\"
; $LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS
cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly
[Winbatch_AdobeShock_uninstall]

3
CLIENT_DATA/delsub3264.ins
View File

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

37
CLIENT_DATA/setup3264.ins
View File

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

8
CLIENT_DATA/uninstall3264.ins
View File

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