Use own General runtimes and change layout of the scripts

This commit is contained in:
Mario Fetka
2013-08-31 17:07:40 +02:00
parent 42ef53d42a
commit 719f30fba1
15 changed files with 267 additions and 190 deletions

View File

@@ -0,0 +1,6 @@
;!@Install@!UTF-8!
RunProgram="opsi-WinPKG.exe"
ExtractTitle="Sereby AIO with Geos One Mods Installer"
ExtractDialogText="Extracting Sereby AIO with Geos One Mods"
GUIMode="1"
;!@InstallEnd@!

View File

@@ -0,0 +1,6 @@
<package id="basicruntimes" name="Allgemeine Runtime Dateien" group="System Runtimes">
<check type="file" condition="<" path="%windir%\system32\AiORuntimes.dll" value="1.0.3.6" />
<install>
<cmd path="Geos_One_General_Runtimes_Installer.msi" param="/qb!"/>
</install>
</package>

Binary file not shown.

View File

@@ -1,7 +0,0 @@
<package id="msvb" name="%NAME% Runtimes" group="Standard Programme" priority="1">
<variable name="NAME" value="Visual Basic and C" />
<install>
<cmd path="Opsi_extra.exe" param="/SILENT /NORESTART" />
</install>
</package>

View File

@@ -108,11 +108,6 @@ if ($sereby_msvc$ = "reinstall")
opsiservicecall_msvc_uninstall
Set $reboot$ = "true"
endif
if ($sereby_msvb$ = "reinstall")
Winbatch_msvb_uninstall
opsiservicecall_msvb_uninstall
Set $reboot$ = "true"
endif
if ($sereby_AdobeFlash$ = "reinstall")
Winbatch_AdobeFlash_uninstall
opsiservicecall_AdobeFlash_uninstall
@@ -298,17 +293,6 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
"%opsiserviceUser%"
]
[Winbatch_msvb_uninstall]
[opsiservicecall_msvb_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_msvb",
"install",
"%opsiserviceUser%"
]
[Winbatch_AdobeFlash_uninstall]
$UninstallFlashExe$ -uninstall

View File

@@ -43,9 +43,6 @@ endif
if ($sereby_msvc$ = "install")
DosInAnIcon_msvc_config
endif
if ($sereby_msvb$ = "install")
DosInAnIcon_msvb_config
endif
if ($sereby_AdobeFlash$ = "install")
DosInAnIcon_AdobeFlash_config
endif
@@ -120,10 +117,6 @@ xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.
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"
[DosInAnIcon_msvb_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msvb']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_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"

View File

@@ -32,8 +32,6 @@ DefVar $sereby_msdxm$
Set $sereby_msdxm$ = GetProductProperty("sereby_msdxm", "install")
DefVar $sereby_msvc$
Set $sereby_msvc$ = GetProductProperty("sereby_msvc", "install")
DefVar $sereby_msvb$
Set $sereby_msvb$ = GetProductProperty("sereby_msvb", "install")
DefVar $sereby_AdobeFlash$
Set $sereby_AdobeFlash$ = GetProductProperty("sereby_AdobeFlash", "install")
DefVar $sereby_AdobeAir$