Correct .net decompress readd java7 .....
This commit is contained in:
Mario Fetka
parent
58f51cfba7
commit
c42bf8f026
|
|
@ -1,9 +1,13 @@
|
|||
<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.2.9200.0" />
|
||||
<check type="file" condition="<" value="4.0.30319.18408" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
|
||||
<install>
|
||||
<cmd arch="x86" path="netfx_Full_LDR_x86.msi" param="/norestart /qb-!" />
|
||||
<cmd arch="x64" path="netfx_Full_LDR_x64.msi" param="/norestart /qb-!" />
|
||||
</install>
|
||||
<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="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>
|
||||
</install>
|
||||
</package>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
@echo off
|
||||
REM ***********************************
|
||||
REM Fixen eines Bugs von Windows, da sonst Java nicht unter Systemrechten installiert werden kann
|
||||
REM Originalwert: %systemroot%\system32\config\systemprofile
|
||||
REM Quelle: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7014194
|
||||
REM
|
||||
reg add "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\ProfileList\S-1-5-18" /V ProfileImagePath /T reg_expand_sz /d "%systemroot%\syswow64\config\systemprofile" /f
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<package id="jre7" name="%NAME%" group="Standard Programme" priority="10">
|
||||
<variable name="NAME" value="Java Runtime Environment 7 Update 55" />
|
||||
<variable name="BUILD" value="7.0.550.13" />
|
||||
<check type="file" condition="<" path="%windir%\system32\java.exe" arch="x86" value="%BUILD%" />
|
||||
<check type="file" condition="<" path="%windir%\SysWOW64\java.exe" arch="x64" value="%BUILD%" />
|
||||
<install>
|
||||
<cmd name="Fix MS SystemUser Bug" path="..\SystemFix.bat" />
|
||||
<cmd path="x86\jre.exe" param="/s REBOOT=Suppress" />
|
||||
<cmd path="x64\jre.exe" param="/s REBOOT=Suppress" arch="x64" name="%NAME% x64" />
|
||||
</install>
|
||||
</package>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<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_GDR_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_GDR_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="x86" path="%windir%\system32\wusa.exe" param="%package%\Windows8.1-KB2934520-x86.msu /norestart /q">
|
||||
<check type="os" condition=">" value="6.2.9200.0" />
|
||||
</cmd>
|
||||
<cmd arch="x64" path="%windir%\system32\wusa.exe" param="%package%\Windows8.1-KB2934520-x64.msu /norestart /q">
|
||||
<check type="os" condition=">" value="6.2.9200.0" />
|
||||
</cmd>
|
||||
</install>
|
||||
</package>
|
||||
|
|
@ -1 +0,0 @@
|
|||
d940a3ab39db48929611563956c898cf8cf5a574 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/aio-runtimes_v2.1.1.1.7z
|
||||
|
|
@ -0,0 +1 @@
|
|||
beef4946b64fcb78be8bcd20a2defd26dbe0b0d8 /home/mario/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/aio-runtimes_v2.1.3.1.7z
|
||||
|
|
@ -5,7 +5,7 @@ VENDOR="sereby.org"
|
|||
PN="sereby.aio"
|
||||
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."
|
||||
VERSION="2.1.1.1"
|
||||
VERSION="2.1.3.1"
|
||||
RELEASE="1"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
|
|
@ -60,14 +60,14 @@ SHOCKVERSION="12.1.1.151"
|
|||
# Update Microsoft Silverlight
|
||||
# ==================================
|
||||
|
||||
SILVERUPDATE="1"
|
||||
SILVERUPDATE="0"
|
||||
SILVERVERSION="5.1.30214.0"
|
||||
|
||||
# ==================================
|
||||
# Take Parts of Ricktendo Update
|
||||
# ==================================
|
||||
|
||||
RICKTENDOJSHARPUPDATE="0"
|
||||
RICKTENDOJSHARPUPDATE="1"
|
||||
RICKTENDOAIO="2014.04.07"
|
||||
|
||||
# ==================================
|
||||
|
|
@ -111,7 +111,7 @@ DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg"
|
|||
|
||||
## 1: 32 & 64 Bit Runtimes
|
||||
DL_FILE[7]="aio-runtimes_v${VERSION}.7z"
|
||||
DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/71248/?download"
|
||||
DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/72152/?download"
|
||||
DL_ARCH[7]="X86"
|
||||
DL_EXTRACT_FORMAT[7]="7zip"
|
||||
DL_EXTRACT_TO[7]="sereby"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ function create() {
|
|||
# sed everything to disabled
|
||||
# ==========================================================================================================
|
||||
|
||||
sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" -e "s|4\.5\..|4\.5|" $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# extract .net 8.0 & 8.1 now so the unix2dos dont change the extracted files
|
||||
|
|
@ -106,7 +106,7 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
|
||||
mkdir -p $INST_DIR/CLIENT_DATA/X86/Ricktendo
|
||||
7z x -o$INST_DIR/CLIENT_DATA/X86/Ricktendo $INST_DIR/CLIENT_DATA/X86/${DL_FILE[20]}
|
||||
7z x -o$INST_DIR/CLIENT_DATA/X86/Ricktendo $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]}
|
||||
|
||||
# ==========================================================================================================
|
||||
# Integrate .net for win 8.0 into winpkg
|
||||
|
|
@ -152,15 +152,21 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
# Update Java
|
||||
# ==========================================================================================================
|
||||
|
||||
mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE7_SystemFix.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/SystemFix.bat
|
||||
|
||||
if [ "$JRE7UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/*/jre.exe
|
||||
mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/{x86,x64}
|
||||
mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE7_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
|
||||
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JRE7UVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JRE7VERSION}"
|
||||
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
else
|
||||
rm $INST_DIR/CLIENT_DATA/Sereby_JRE7_package.xml
|
||||
fi
|
||||
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
#sed 's/.*<\/settings>.*/\t<set component="jre7" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
if [ "$JRE8UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.exe
|
||||
|
|
@ -232,8 +238,8 @@ function create() {
|
|||
|
||||
if [ "$RICKTENDONET40UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.0/*
|
||||
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[21]}
|
||||
#7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]}
|
||||
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
|
||||
#7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
|
||||
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET40_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.0/package.xml
|
||||
else
|
||||
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET40_package.xml
|
||||
|
|
@ -242,11 +248,13 @@ function create() {
|
|||
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]}
|
||||
7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]}
|
||||
#7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]}
|
||||
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
|
||||
mv $INST_DIR/CLIENT_DATA/Install/NET/4.5.* $INST_DIR/CLIENT_DATA/Install/NET/4.5
|
||||
sed -e "s|4\.5\..|4\.5|g" -i $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml
|
||||
fi
|
||||
|
||||
# ==========================================================================================================
|
||||
|
|
|
|||
Loading…
Reference in New Issue