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

10
CLIENT_DATA/setup3264.ins
View File

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

2
OPSI/control
View File

@ -43,7 +43,7 @@ multivalue: False
editable: True editable: True
description: Time until installation starts (0 for immediate installation) description: Time until installation starts (0 for immediate installation)
values: ["40"] values: ["40"]
default: ["40"] default: ["5"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode

1
aio-runtimes_v2.0.4.1.7z.sha1sum Normal file
View File

@ -0,0 +1 @@
9c0c0c3319430e4f468fca860eda5ab7e89c8c7a /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/aio-runtimes_v2.0.4.1.7z

2
builder-product.cfg
View File

@ -5,7 +5,7 @@ VENDOR="sereby.org"
PN="sereby.aio" PN="sereby.aio"
NAME="All in One Runtimes " NAME="All in One Runtimes "
DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren." DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren."
VERSION="2.0.3.1" VERSION="2.0.4.1"
RELEASE="1" RELEASE="1"
PRIORITY="0" PRIORITY="0"
ADVICE="" ADVICE=""

4
builder-targets-cb.sh
View File

@ -49,9 +49,9 @@ function create() {
# update parts of the sereby with the Dimple package (Dimpel just updates everything exept dotnet) # update parts of the sereby with the Dimple package (Dimpel just updates everything exept dotnet)
# rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/JRE/* $INST_DIR/CLIENT_DATA/Install/Packages/JRE # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/JRE/* $INST_DIR/CLIENT_DATA/Install/Packages/JRE
rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash
# 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
rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight
# move the Windows 8 dotnet 2 - 3.5 in place # move the Windows 8 dotnet 2 - 3.5 in place
mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET8 mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET8

1
dimpel-aio-runtimes_v2.0.4.1.7z.sha1sum Normal file
View File

@ -0,0 +1 @@
8d075a36be7631960d545e68a84d7ce4987f4631 /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/dimpel-aio-runtimes_v2.0.4.1.7z