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

Bump .net and rename .net to 4.5

Browse Source
This commit is contained in:
Mario Fetka 2014-05-11 13:39:38 +02:00
parent f24fdcd633
commit a61fcf17c6
13 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLIENT_DATA/Ricktendo_NET451_package.xml → CLIENT_DATA/Ricktendo_NET45_package.xml
View File

@ -1,4 +1,4 @@
<package id="net4.5.1" name=".NET Framework 4.5.1" group="Microsoft .NET Framework" priority="44"> <package id="net4.5" name=".NET Framework 4.5" group="Microsoft .NET Framework" priority="44">
<check type="os" condition=">" value="6.0.6002.0" /> <check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" /> <check type="os" condition="<" value="6.2.9200.0" />
<check type="file" condition="<" value="4.0.30319.18408" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" /> <check type="file" condition="<" value="4.0.30319.18408" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />

14
CLIENT_DATA/cleanup3264.ins
View File

@ -56,9 +56,9 @@ if ($sereby_dotnet4.0$ = "reinstall")
opsiservicecall_dotnet4.0_uninstall opsiservicecall_dotnet4.0_uninstall
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
if ($sereby_dotnet4.5.1$ = "reinstall") if ($sereby_dotnet4.5$ = "reinstall")
Winbatch_dotnet4.5.1_uninstall Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5.1_uninstall opsiservicecall_dotnet4.5_uninstall
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
@ -196,14 +196,14 @@ endif
"%opsiserviceUser%" "%opsiserviceUser%"
] ]
[Winbatch_dotnet4.5.1_uninstall] [Winbatch_dotnet4.5_uninstall]
%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 /u"
[opsiservicecall_dotnet4.5.1_uninstall] [opsiservicecall_dotnet4.5_uninstall]
"method": "setProductProperty" "method": "setProductProperty"
"params": [ "params": [
"$ProductId$", "$ProductId$",
"sereby_dotnet4.5.1", "sereby_dotnet4.5",
"install", "install",
"%opsiserviceUser%" "%opsiserviceUser%"
] ]

8
CLIENT_DATA/config3264.ins
View File

@ -16,8 +16,8 @@ endif
if ($sereby_dotnet4.0$ = "install") if ($sereby_dotnet4.0$ = "install")
DosInAnIcon_dotnet4.0_config DosInAnIcon_dotnet4.0_config
endif endif
if ($sereby_dotnet4.5.1$ = "install") if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5.1_config DosInAnIcon_dotnet4.5_config
endif endif
if ($sereby_win8xdotnet3x$ = "install") if ($sereby_win8xdotnet3x$ = "install")
DosInAnIcon_win8xdotnet3x_config DosInAnIcon_win8xdotnet3x_config
@ -90,9 +90,9 @@ xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG
copy "$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"
[DosInAnIcon_dotnet4.5.1_config] [DosInAnIcon_dotnet4.5_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.5.1']/@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"
[DosInAnIcon_win8xdotnet3x_config] [DosInAnIcon_win8xdotnet3x_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"

4
CLIENT_DATA/define3264.inc
View File

@ -14,8 +14,8 @@ DefVar $sereby_dotnet3.5$
Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install") Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install")
DefVar $sereby_dotnet4.0$ DefVar $sereby_dotnet4.0$
Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none") Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none")
DefVar $sereby_dotnet4.5.1$ DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5.1$ = GetProductProperty("sereby_dotnet4.5.1", "install") Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_win8xdotnet3x$ DefVar $sereby_win8xdotnet3x$
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
DefVar $sereby_msjsharp$ DefVar $sereby_msjsharp$

4
OPSI/control
View File

@ -101,10 +101,10 @@ default: ["install"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: sereby_dotnet4.5.1 name: sereby_dotnet4.5
multivalue: False multivalue: False
editable: False editable: False
description: Install Microsoft Netframework 4.5.1 description: Install Microsoft Netframework 4.5
values: ["install", "none", "reinstall"] values: ["install", "none", "reinstall"]
default: ["install"] default: ["install"]

10
builder-product.cfg
View File

@ -76,7 +76,7 @@ RICKTENDOAIO="2014.04.07"
RICKTENDONET40UPDATE="1" RICKTENDONET40UPDATE="1"
RICKTENDONET45UPDATE="1" RICKTENDONET45UPDATE="1"
RICKTENDONET="2014.04.25" RICKTENDONET="2014.05.06"
# ================================== # ==================================
# General Runtimes Verison # General Runtimes Verison
@ -228,13 +228,13 @@ DL_ARCH[24]="X86"
DL_WINST_NAME[24]=RicktendoNet40Lang DL_WINST_NAME[24]=RicktendoNet40Lang
#DL_FILE[25]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe" #DL_FILE[25]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
DL_FILE[25]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe" DL_FILE[25]="dotNetFx45_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe" DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx452_Full_LDR_x86_x64_Slim.exe"
DL_ARCH[25]="X86" DL_ARCH[25]="X86"
DL_WINST_NAME[25]=Ricktendo45Exe DL_WINST_NAME[25]=Ricktendo45Exe
DL_FILE[26]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z" DL_FILE[26]="dotNetFx45LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z" DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx452LP_Full_LDR_x86_x64de_Slim.7z"
DL_ARCH[26]="X86" DL_ARCH[26]="X86"
DL_WINST_NAME[26]=RicktendoNet45Lang DL_WINST_NAME[26]=RicktendoNet45Lang

12
builder-targets-cb.sh
View File

@ -227,7 +227,7 @@ function create() {
sed 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml sed 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
# ========================================================================================================== # ==========================================================================================================
# Update .NET 4.0 & 4.5.1 with Ricktendo # Update .NET 4.0 & 4.5 with Ricktendo
# ========================================================================================================== # ==========================================================================================================
if [ "$RICKTENDONET40UPDATE" = "1" ]; then if [ "$RICKTENDONET40UPDATE" = "1" ]; then
@ -240,12 +240,12 @@ function create() {
fi fi
if [ "$RICKTENDONET45UPDATE" = "1" ]; then if [ "$RICKTENDONET45UPDATE" = "1" ]; then
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/* rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5/*
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]} 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.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]} #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_NET451_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/package.xml mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml
else else
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET451_package.xml rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
fi fi
# ========================================================================================================== # ==========================================================================================================

2
dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z.sha1sum → dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z.sha1sum
View File

@ -1 +1 @@
72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40LP_Full_x86_x64de_Slim_2014.04.25.7z 72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.06.7z

2
dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe.sha1sum → dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe.sha1sum
View File

@ -1 +1 @@
8e7b229c5812fb81c1d5c6122637d17f3b215f80 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40_Full_x86_x64_Slim_2014.04.25.exe 8e7b229c5812fb81c1d5c6122637d17f3b215f80 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx40_Full_x86_x64_Slim_2014.05.06.exe

1
dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z.sha1sum
View File

@ -1 +0,0 @@
9c7019de003f9280b7f4ee1b10dc79956c2412c7 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx451LP_Full_LDR_x86_x64de_Slim_2014.04.25.7z

1
dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe.sha1sum
View File

@ -1 +0,0 @@
2fd6422e633e315d8d8013697260a71cb0cb8d9b /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx451_Full_LDR_x86_x64_Slim_2014.04.25.exe

1
dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z.sha1sum Normal file
View File

@ -0,0 +1 @@
965784760209703992b774519a29418064b9959c /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx45LP_Full_LDR_x86_x64de_Slim_2014.05.06.7z

1
dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe.sha1sum Normal file
View File

@ -0,0 +1 @@
f6543104a6ce4a83cc9eaaed1235c83c338e07c4 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2014.05.06.exe