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

Bump and add .net 4.6

Browse Source
This commit is contained in:
Mario Fetka 2015-07-24 13:57:53 +02:00
parent ef3c3e51e9
commit 1edcab19b7
19 changed files with 123 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CLIENT_DATA/Ricktendo_NET46_package.xml Normal file
View File

@ -0,0 +1,21 @@
<package id="net4.6" name=".NET Framework 4.6" 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>

32
CLIENT_DATA/cleanup3264.ins
View File

@ -12,6 +12,17 @@ if ($sereby_dotnet4.5$ = "uninstall")
Set $reboot$ = "true" Set $reboot$ = "true"
endif endif
if ($sereby_dotnet4.6$ = "reinstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_reinstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.6$ = "uninstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_uninstall
Set $reboot$ = "true"
endif
; a reboot is requred after the .net cleanup so that further uninstalls can work ; a reboot is requred after the .net cleanup so that further uninstalls can work
if ($reboot$ = "true") if ($reboot$ = "true")
comment "uninstall done now force Reboot" comment "uninstall done now force Reboot"
@ -264,6 +275,27 @@ endif
"%opsiserviceUser%" "%opsiserviceUser%"
] ]
[Winbatch_dotnet4.6_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u"
[opsiservicecall_dotnet4.6_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.6",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.6_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.6",
"none",
"%opsiserviceUser%"
]
[Dosbatch_msjsharp_uninstall] [Dosbatch_msjsharp_uninstall]
[opsiservicecall_msjsharp_reinstall] [opsiservicecall_msjsharp_reinstall]

7
CLIENT_DATA/config3264.ins
View File

@ -4,6 +4,9 @@ DosInAnIcon_init_config
if ($sereby_dotnet4.5$ = "install") if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5_config DosInAnIcon_dotnet4.5_config
endif endif
if ($sereby_dotnet4.6$ = "install")
DosInAnIcon_dotnet4.6_config
endif
if ($sereby_win8xdotnet3x$ = "install") if ($sereby_win8xdotnet3x$ = "install")
DosInAnIcon_win8xdotnet3x_config DosInAnIcon_win8xdotnet3x_config
endif endif
@ -56,6 +59,10 @@ xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$
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']/@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_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"
[DosInAnIcon_win8xdotnet3x_config] [DosInAnIcon_win8xdotnet3x_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='NetWin8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" xml ed -O -u "/settings/set[@component='NetWin8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"

2
CLIENT_DATA/define3264.inc
View File

@ -6,6 +6,8 @@ DefVar $sereby_timer_enabled$
Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1") Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
DefVar $sereby_dotnet4.5$ DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install") 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$ DefVar $sereby_win8xdotnet3x$
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install") Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
DefVar $sereby_msjsharp$ DefVar $sereby_msjsharp$

9
OPSI/control
View File

@ -63,6 +63,15 @@ description: Install Microsoft Netframework 4.5
values: ["install", "none", "reinstall", "uninstall"] values: ["install", "none", "reinstall", "uninstall"]
default: ["install"] default: ["install"]
[ProductProperty]
type: unicode
name: sereby_dotnet4.6
multivalue: False
editable: False
description: Install Microsoft Netframework 4.6
values: ["install", "none", "reinstall", "uninstall"]
default: ["install"]
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: sereby_win8xdotnet3x name: sereby_win8xdotnet3x

1
Silverlight-5.1.40620.0.exe.sha1sum Normal file
View File

@ -0,0 +1 @@
45f07952e2e6cf8bd972a733aacb213871d086f1 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/Silverlight-5.1.40620.0.exe

1
Silverlight_x64-5.1.40620.0.exe.sha1sum Normal file
View File

@ -0,0 +1 @@
56ade2a82b7083383c9e4453af1da0301b48ac53 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/Silverlight_x64-5.1.40620.0.exe

1
aio-runtimes_v2.2.2.1.exe.sha1sum
View File

@ -1 +0,0 @@
8f27158d79c97a5e78ab59d77f067b91ac832c98 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/aio-runtimes_v2.2.2.1.exe

1
aio-runtimes_v2.2.3.1.exe.sha1sum Normal file
View File

@ -0,0 +1 @@
e0eb74d1aca146ea0e1618846e90ca86fb938126 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/aio-runtimes_v2.2.3.1.exe

45
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.2.2.1" VERSION="2.2.3.1"
RELEASE="1" RELEASE="1"
PRIORITY="0" PRIORITY="0"
ADVICE="" ADVICE=""
@ -66,7 +66,7 @@ SHOCKVERSION="12.1.9.159"
# ================================== # ==================================
SILVERUPDATE="1" SILVERUPDATE="1"
SILVERVERSION="5.1.40416.0" SILVERVERSION="5.1.40620.0"
# ================================== # ==================================
# Take Parts of Ricktendo Update # Take Parts of Ricktendo Update
@ -79,10 +79,13 @@ RICKTENDOAIO="2014.11.11"
# Take Ricktendo .net Update # Take Ricktendo .net Update
# ================================== # ==================================
RICKTENDONET45UPDATE="1" RICKTENDONET45UPDATE="0"
RICKTENDONET45VER="452" RICKTENDONET45VER="452"
RICKTENDONET45LANGVER="452" RICKTENDONET45LANGVER="452"
RICKTENDONET="2015.06.25" RICKTENDONET46UPDATE="1"
RICKTENDONET46VER="46"
RICKTENDONET46LANGVER="46"
RICKTENDONET="2015.07.20"
# ================================== # ==================================
# General Runtimes Verison # General Runtimes Verison
@ -205,12 +208,12 @@ DL_ARCH[18]="X86"
DL_WINST_NAME[18]=InstallShockMsi DL_WINST_NAME[18]=InstallShockMsi
DL_FILE[19]="Silverlight-${SILVERVERSION}.exe" DL_FILE[19]="Silverlight-${SILVERVERSION}.exe"
DL_SOURCE[19]="http://download.microsoft.com/download/B/D/C/BDCE18B1-73C1-47BA-9B11-46A4C14CF7B0/40416.00/Silverlight.exe" DL_SOURCE[19]="http://silverlight.dlservice.microsoft.com/download/5/A/4/5A4F7D41-D714-42B4-9F5F-A2B0B985CBAC/40620.00/Silverlight.exe"
DL_ARCH[19]="X86" DL_ARCH[19]="X86"
DL_WINST_NAME[19]=InstallSilver32Exe DL_WINST_NAME[19]=InstallSilver32Exe
DL_FILE[20]="Silverlight_x64-${SILVERVERSION}.exe" DL_FILE[20]="Silverlight_x64-${SILVERVERSION}.exe"
DL_SOURCE[20]="http://download.microsoft.com/download/B/D/C/BDCE18B1-73C1-47BA-9B11-46A4C14CF7B0/40416.00/Silverlight_x64.exe" DL_SOURCE[20]="http://silverlight.dlservice.microsoft.com/download/5/A/4/5A4F7D41-D714-42B4-9F5F-A2B0B985CBAC/40620.00/Silverlight_x64.exe"
DL_ARCH[20]="X86" DL_ARCH[20]="X86"
DL_WINST_NAME[20]=InstallSilver64Exe DL_WINST_NAME[20]=InstallSilver64Exe
@ -235,19 +238,29 @@ DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET45LANGVER}
DL_ARCH[24]="X86" DL_ARCH[24]="X86"
DL_WINST_NAME[24]=RicktendoNet45Lang DL_WINST_NAME[24]=RicktendoNet45Lang
# General Runtimes DL_FILE[25]="dotNetFx46_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z" DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET46VER}_Full_LDR_x86_x64_Slim.exe"
DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
DL_ARCH[25]="X86" DL_ARCH[25]="X86"
DL_EXTRACT_FORMAT[25]="7zip" DL_WINST_NAME[25]=Ricktendo46Exe
DL_EXTRACT_TO[25]="Basic"
DL_FILE[26]="dotNetFx46LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET46LANGVER}LP_Full_LDR_x86_x64de_Slim.7z"
DL_ARCH[26]="X86"
DL_WINST_NAME[26]=RicktendoNet46Lang
# General Runtimes # General Runtimes
DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z" DL_FILE[27]="geos_one-general-runtimes_${GENERALVERSION}.7z"
DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z" DL_SOURCE[27]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
DL_ARCH[26]="X86" DL_ARCH[27]="X86"
DL_EXTRACT_FORMAT[26]="7zip" DL_EXTRACT_FORMAT[27]="7zip"
DL_EXTRACT_TO[26]="MSVC" 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"
################## ##################
### Uninstallers ### Uninstallers

15
builder-targets-cb.sh
View File

@ -254,6 +254,21 @@ function create() {
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
fi fi
# ==========================================================================================================
# Update .NET 4.6 with Ricktendo
# ==========================================================================================================
sed -e 's/.*<\/settings>.*/\t<set component="net4.6" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
if [ "$RICKTENDONET46UPDATE" = "1" ]; then
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.6
mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.6
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]}
7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]}
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
fi
# ========================================================================================================== # ==========================================================================================================
# Update MSVC # Update MSVC
# ========================================================================================================== # ==========================================================================================================

1
dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.06.25.7z.sha1sum
View File

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

1
dotNetFx45LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum Normal file
View File

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

1
dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe.sha1sum
View File

@ -1 +0,0 @@
200a31ebb0c8c5cf3d398e99694387a824d0293d /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/dotNetFx45_Full_LDR_x86_x64_Slim_2015.06.25.exe

1
dotNetFx45_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum Normal file
View File

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

1
dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z.sha1sum Normal file
View File

@ -0,0 +1 @@
feacf45e7e4465ced615d95903ff8443288456bb /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx46LP_Full_LDR_x86_x64de_Slim_2015.07.20.7z

1
dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe.sha1sum Normal file
View File

@ -0,0 +1 @@
ae74226e22dd21e520eb2a728ff684ad67f39910 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotNetFx46_Full_LDR_x86_x64_Slim_2015.07.20.exe

1
dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip.sha1sum
View File

@ -1 +0,0 @@
add9e0a7e3f4e5ca64c771402a5f6c3a93678187 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.2.1/X86/dotnetfx_5F00_cleanup_5F00_tool-2.2.2.1.zip

1
dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip.sha1sum Normal file
View File

@ -0,0 +1 @@
add9e0a7e3f4e5ca64c771402a5f6c3a93678187 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.3.1/X86/dotnetfx_5F00_cleanup_5F00_tool-2.2.3.1.zip