Blind Bump

This commit is contained in:
Mario Fetka 2015-10-22 12:35:38 +02:00
parent 95f16e1ab2
commit 5a8625062c
26 changed files with 35 additions and 265 deletions

View File

@ -1,21 +0,0 @@
<package id="net4.5" name=".NET Framework 4.5.2" group="Microsoft .NET Framework" priority="44">
<check type="file" condition="<" value="4.0.30319.34209" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
<install>
<cmd arch="x86" path="netfx_Full_LDR_x86.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x86" path="netfx_FullLP_LDR_x86.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x64" path="netfx_Full_LDR_x64.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x64" path="netfx_FullLP_LDR_x64.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
</install>
</package>

View File

@ -1,6 +1,5 @@
<settings maximized="1">
<timer value="40" enabled="1" />
<set component="net4.5" checked="1" />
<set component="net4.6" checked="1" />
<set component="msjsharp" checked="1" />
<set component="silver" checked="1" />

View File

@ -1,17 +1,6 @@
DefVar $reboot$
Set $reboot$ = "false"
if ($sereby_dotnet4.5$ = "reinstall")
Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5_reinstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.5$ = "uninstall")
Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5_uninstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.6$ = "reinstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_reinstall
@ -146,135 +135,6 @@ if ($reboot$ = "true")
ExitWindows /ImmediateReboot
endif
[Winbatch_dotnet1.1_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.0 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.1 /u"
[opsiservicecall_dotnet1.1_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet1.1",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet1.1_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet1.1",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet2.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 2.0 /u"
[opsiservicecall_dotnet2.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet2.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet2.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet2.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet3.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.0 /u"
[opsiservicecall_dotnet3.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet3.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet3.5_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.5 /u"
[opsiservicecall_dotnet3.5_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.5",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet3.5_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.5",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.0 /u"
[opsiservicecall_dotnet4.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.5_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.1 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.2 /u"
[opsiservicecall_dotnet4.5_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.5",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.5_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.5",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.6_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u"
@ -554,24 +414,3 @@ wmic /INTERACTIVE:OFF product where name="Adobe AIR" call uninstall
"%opsiserviceUser%"
]
; windows xp dotnet bug uninstall
; uninstall all languages and then remove .net
[Winbatch_uninstall_msi_net35_deu_32]
msiexec /x {052FDD78-A6EA-3187-8386-C82F4CA3A929} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net30_deu_32]
msiexec /x {C2C284D2-6BD7-3B34-B0C5-B2CAED168DF7} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net20_deu_32]
msiexec /x {C314CE45-3392-3B73-B4E1-139CD41CA933} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net11_deu_32]
msiexec /x {E78BFA60-5393-4C38-82AB-E8019E464EB4} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net40_extended_deu_32]
msiexec /x {C911A0C2-2236-3164-AA47-F2566C01AE5E} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net40_client_deu_32]
msiexec /x {F750C986-5310-3A5A-95F8-4EC71C8AC01C} /qb! REBOOT=ReallySuppress

View File

@ -1,9 +1,6 @@
DosInAnIcon_init_config
if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5_config
endif
if ($sereby_dotnet4.6$ = "install")
DosInAnIcon_dotnet4.6_config
endif
@ -55,10 +52,6 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDi
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_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"
[DosInAnIcon_dotnet4.6_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.6']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"

View File

@ -4,8 +4,6 @@ DefVar $sereby_timer_value$
Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5")
DefVar $sereby_timer_enabled$
Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_dotnet4.6$
Set $sereby_dotnet4.6$ = GetProductProperty("sereby_dotnet4.6", "install")
DefVar $sereby_win8xdotnet3x$

View File

@ -54,15 +54,6 @@ description: Timer enabled
values: ["0", "1"]
default: ["1"]
[ProductProperty]
type: unicode
name: sereby_dotnet4.5
multivalue: False
editable: False
description: Install Microsoft Netframework 4.5
values: ["install", "none", "reinstall", "uninstall"]
default: ["install"]
[ProductProperty]
type: unicode
name: sereby_dotnet4.6

View File

@ -1 +0,0 @@
6c8dd3ede44b6a254c87d93e53754d34411391d6 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/air_18.0.0.199_win.exe

View File

@ -0,0 +1 @@
3bc2a568204a3a9b59ca347ab49585f0c5fab279 /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/air_19.0.0.213_win.exe

View File

@ -29,8 +29,8 @@ CREATENEWSEREBY="1"
# Adobe Air Verison
# ==================================
AIRVERSION="18.0.0.199"
AIRMAJOR="18.0"
AIRVERSION="19.0.0.213"
AIRMAJOR="19.0"
# ==================================
# Update Java 7/8
@ -42,17 +42,17 @@ JRE7BUILD="15"
JRE7VERSION="7.0.800.15"
JRE8UPDATE="1"
JRE8UVERSION="60"
JRE8BUILD="27"
JRE8VERSION="8.0.60.27"
JRE8UVERSION="66"
JRE8BUILD="17"
JRE8VERSION="8.0.66.17"
# ==================================
# Update Adobe Flash
# ==================================
FLASHUPDATE="1"
FLASHVERSION="18.0.0.232"
FLASHAXVERSION="18.0.0.232"
FLASHVERSION="19.0.0.226"
FLASHAXVERSION="19.0.0.226"
# ==================================
# Update Adobe Schockave
@ -79,13 +79,10 @@ RICKTENDOAIO="2014.11.11"
# Take Ricktendo .net Update
# ==================================
RICKTENDONET45UPDATE="1"
RICKTENDONET45VER="452"
RICKTENDONET45LANGVER="452"
RICKTENDONET46UPDATE="1"
RICKTENDONET46VER="46"
RICKTENDONET46LANGVER="46"
RICKTENDONET="2015.09.10"
RICKTENDONET="2015.09.23"
# ==================================
# General Runtimes Verison
@ -228,39 +225,29 @@ DL_SOURCE[22]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
DL_ARCH[22]="X86"
DL_WINST_NAME[22]=RicktendoAioExe
DL_FILE[23]="dotNetFx45_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET45VER}_Full_LDR_x86_x64_Slim.exe"
DL_FILE[23]="dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim_${RICKTENDONET}.7z"
DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim.7z"
DL_ARCH[23]="X86"
DL_WINST_NAME[23]=Ricktendo45Exe
DL_WINST_NAME[23]=Ricktendo46Exe
DL_FILE[24]="dotNetFx45LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET45LANGVER}LP_Full_LDR_x86_x64de_Slim.7z"
DL_FILE[24]="dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim.7z"
DL_ARCH[24]="X86"
DL_WINST_NAME[24]=RicktendoNet45Lang
DL_WINST_NAME[24]=RicktendoNet46Lang
DL_FILE[25]="dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim_${RICKTENDONET}.7z"
DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim.7z"
# General Runtimes
DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z"
DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
DL_ARCH[25]="X86"
DL_WINST_NAME[25]=Ricktendo46Exe
DL_EXTRACT_FORMAT[25]="7zip"
DL_EXTRACT_TO[25]="Basic"
DL_FILE[26]="dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim.7z"
# General Runtimes
DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
DL_ARCH[26]="X86"
DL_WINST_NAME[26]=RicktendoNet46Lang
# General Runtimes
DL_FILE[27]="geos_one-general-runtimes_${GENERALVERSION}.7z"
DL_SOURCE[27]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
DL_ARCH[27]="X86"
DL_EXTRACT_FORMAT[27]="7zip"
DL_EXTRACT_TO[27]="Basic"
# General Runtimes
DL_FILE[28]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
DL_SOURCE[28]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
DL_ARCH[28]="X86"
DL_EXTRACT_FORMAT[28]="7zip"
DL_EXTRACT_TO[28]="MSVC"
DL_EXTRACT_FORMAT[26]="7zip"
DL_EXTRACT_TO[26]="MSVC"
##################
### Uninstallers

View File

@ -240,20 +240,6 @@ function create() {
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_FS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/package.xml
sed -e 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
# ==========================================================================================================
# Update .NET 4.5 with Ricktendo
# ==========================================================================================================
if [ "$RICKTENDONET45UPDATE" = "1" ]; then
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5
mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.5
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml
else
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
fi
# ==========================================================================================================
# Update .NET 4.6 with Ricktendo
# ==========================================================================================================
@ -262,10 +248,10 @@ function create() {
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.6
mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.6
mkdir -p $INST_DIR/CLIENT_DATA/X86/net46
7z x -o$INST_DIR/CLIENT_DATA/X86/net46 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]}
#7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]}
7z x -o$INST_DIR/CLIENT_DATA/X86/net46 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
#7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/net46/*.exe
7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]}
7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.6/package.xml
else
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml

View File

@ -1 +0,0 @@
965784760209703992b774519a29418064b9959c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.09.10.7z

View File

@ -1 +0,0 @@
0507729dc2c0fbc79db2558388a22e30380c7c02 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2015.09.10.exe

View File

@ -1 +0,0 @@
feacf45e7e4465ced615d95903ff8443288456bb /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx46LP_Full_x86_x64de_Slim_2015.09.10.7z

View File

@ -0,0 +1 @@
feacf45e7e4465ced615d95903ff8443288456bb /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx46LP_Full_x86_x64de_Slim_2015.09.23.7z

View File

@ -1 +0,0 @@
e320811151c99c92990bfcb0504dc2b6e222b2ca /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx46_Full_x86_x64_Slim_2015.09.10.7z

View File

@ -0,0 +1 @@
fbb8125f43208db0a9cf4216523ba0df931555a7 /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/dotNetFx46_Full_x86_x64_Slim_2015.09.23.7z

View File

@ -1 +0,0 @@
170493832b3936a054bde7f1fc8dc6da2f8f7838 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/install_flash_player-18.0.0.232.exe

View File

@ -0,0 +1 @@
3ed053d6dca8704f4463e842ea3e4f3bf4451d7c /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/install_flash_player-19.0.0.226.exe

View File

@ -1 +0,0 @@
e15c136ecee15e03e7e7f2d6a3f4c74279965f2b /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/install_flash_player_ax-18.0.0.232.exe

View File

@ -0,0 +1 @@
f094cf6b6b1b9bf36ca96acb9ed1625ea1e4adfd /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/install_flash_player_ax-19.0.0.226.exe

View File

@ -1 +0,0 @@
87976e29f58276685c63833ae42df7b2b5fe921c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/jre8u60-b27-x64.exe

View File

@ -1 +0,0 @@
bd486f62bc358b1180218480a1cbb0a42483af98 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/jre8u60-b27-x86.exe

View File

@ -0,0 +1 @@
91bae8e450943c412e9169c81ec0a36b9bc3930b /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/jre8u66-b17-x64.exe

View File

@ -0,0 +1 @@
665176b21d76750fde007cb6e33f71852e2f605d /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/jre8u66-b17-x86.exe

View File

@ -1 +0,0 @@
02fbf304d2f58a22c207a32f59db273d95a6e57f /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/uninstall_flash_player-18.0.0.232.exe

View File

@ -0,0 +1 @@
883b9c83d257fa48d23e1a3bf8953c6c28c63a03 /home/mario/.opsi-dist-cache/sereby.aio-2.3.0.1/X86/uninstall_flash_player-19.0.0.226.exe