Bump
This commit is contained in:
Mario Fetka
parent
0a88977167
commit
c46912bc28
|
|
@ -1,8 +0,0 @@
|
|||
@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 @@
|
|||
40c7e724b3dbf10bc7aedd46c86b410cd8ac14f8 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.4.1/X86/aio-runtimes_v2.1.4.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.3.1"
|
||||
VERSION="2.1.4.1"
|
||||
RELEASE="1"
|
||||
PRIORITY="0"
|
||||
ADVICE=""
|
||||
|
|
@ -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/72152/?download"
|
||||
DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/73057/?download"
|
||||
DL_ARCH[7]="X86"
|
||||
DL_EXTRACT_FORMAT[7]="7zip"
|
||||
DL_EXTRACT_TO[7]="sereby"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ function cleanup() {
|
|||
function retrieve() {
|
||||
echo "Retrieve"
|
||||
# work around big file download for verison change
|
||||
local olddir=`echo $DIST_CACHE_DIR | sed -e "s/\/[^\/]*$//"`
|
||||
local olddir=`echo $DIST_CACHE_DIR | sed -e 's/\/[^\/]*$//'`
|
||||
echo $olddir
|
||||
mv $olddir/${PN}-* tempsereby
|
||||
mv tempsereby $DIST_CACHE_DIR
|
||||
|
|
@ -55,6 +55,15 @@ patch_package_xml() {
|
|||
rm ${xml_file}.old
|
||||
}
|
||||
|
||||
patch_delete_xml() {
|
||||
local xml_file=$1
|
||||
local xml_path=$2
|
||||
|
||||
mv ${xml_file} ${xml_file}.old
|
||||
cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | xmlstarlet ed -O -d "${xml_path}" | sed -e 's!>!>!g' -e 's!<!<!g' > ${xml_file}
|
||||
rm ${xml_file}.old
|
||||
}
|
||||
|
||||
tidy_xml() {
|
||||
local xml_file=$1
|
||||
local xml_path=$2
|
||||
|
|
@ -89,8 +98,15 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
# sed everything to disabled
|
||||
# ==========================================================================================================
|
||||
|
||||
sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" -e "s|net4\.5\..|net4\.5|" $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
# !!! remove me whne fixed !!!
|
||||
mv $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old
|
||||
cat $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old | grep -v NetWin8 > $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
|
||||
rm $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old
|
||||
sed -e 's/.*<\/settings>.*/\t<set component="NetWin8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
|
||||
# !!! remove me whne fixed !!!
|
||||
|
||||
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
|
||||
|
||||
# ==========================================================================================================
|
||||
# extract .net 8.0 & 8.1 now so the unix2dos dont change the extracted files
|
||||
|
|
@ -121,7 +137,7 @@ function create() {
|
|||
echo "echo Installing .NET Framwork 2.0 - 3.5.1" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
|
||||
sed 's/.*<\/settings>.*/\t<set component="NetWin8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
|
||||
# ==========================================================================================================
|
||||
# Replace the General Runtimes with the Msi version off GeosOne
|
||||
|
|
@ -139,7 +155,7 @@ function create() {
|
|||
mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air14-0_win.exe
|
||||
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
|
||||
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
|
||||
sed 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed -e 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml "/package/check[@type='file']/@value" "${AIRVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml "/package[@id='AdobeAir']/@name" "Adobe AIR v${AIRVERSION}"
|
||||
|
|
@ -154,8 +170,6 @@ 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
|
||||
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
|
||||
|
|
@ -163,11 +177,11 @@ function create() {
|
|||
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
|
||||
sed -e '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/.*<\/settings>.*/\t<set component="jre7" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed -e '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
|
||||
|
|
@ -176,8 +190,7 @@ function create() {
|
|||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 8 Update ${JRE8UVERSION}"
|
||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='BUILD']/@value" "${JRE8VERSION}"
|
||||
fi
|
||||
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
sed 's/.*<\/settings>.*/\t<set component="jre8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Update Flash
|
||||
|
|
@ -192,7 +205,7 @@ function create() {
|
|||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION_FILE_AX']/@value" "${FLASHAXVERSION//./_}"
|
||||
fi
|
||||
# sed force update on flash
|
||||
sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
sed -e 's!-install!-force -install!' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Update Shockwave
|
||||
|
|
@ -231,7 +244,7 @@ function create() {
|
|||
|
||||
mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/fsharp $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/
|
||||
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_FS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/package.xml
|
||||
sed 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed -e 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
# Update .NET 4.0 & 4.5 with Ricktendo
|
||||
|
|
@ -247,15 +260,13 @@ function create() {
|
|||
fi
|
||||
|
||||
if [ "$RICKTENDONET45UPDATE" = "1" ]; then
|
||||
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5*
|
||||
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[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|net4\.5\..|net4\.5|g" -i $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml
|
||||
fi
|
||||
|
||||
# ==========================================================================================================
|
||||
|
|
@ -266,11 +277,12 @@ function create() {
|
|||
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
||||
mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
||||
else
|
||||
sed -e "s!vcredist.msi!Install.cmd!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2005']"
|
||||
patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml "/package/install/cmd[@param='2008']"
|
||||
sed -e 's!vcredist.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC05_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_05/Install.cmd
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC05_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_05/Install.cmd
|
||||
# rm $INST_DIR/CLIENT_DATA/MSVC05_x86_Install.cmd $INST_DIR/CLIENT_DATA/MSVC05_x64_Install.cmd
|
||||
sed -e "s!vc_red.msi!Install.cmd!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
sed -e 's!vc_red.msi!Install.cmd!' -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC08_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_08/Install.cmd
|
||||
mv -v $INST_DIR/CLIENT_DATA/MSVC08_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_08/Install.cmd
|
||||
fi
|
||||
|
|
@ -295,6 +307,12 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
# Correct linefeed in config
|
||||
# ==========================================================================================================
|
||||
for file in `find $INST_DIR/CLIENT_DATA/Install -type f -name "package.xml"`
|
||||
do
|
||||
echo "Cleanup $file"
|
||||
tidy_xml $file
|
||||
unix2dos $file
|
||||
done
|
||||
|
||||
tidy_xml $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
|
|
@ -304,7 +322,7 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
|
||||
if [ "$CREATENEWSEREBY" = "1" ]; then
|
||||
sed -e "s!\"0\"!\"1\"!g" $INST_DIR/CLIENT_DATA/Config/WinPKG.xml > $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
|
||||
sed -e 's!\"0\"!\"1\"!g' $INST_DIR/CLIENT_DATA/Config/WinPKG.xml > $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
|
||||
7z a $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z $INST_DIR/CLIENT_DATA/Install/*
|
||||
mv -v $INST_DIR/CLIENT_DATA/AIO_7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt
|
||||
cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z > $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.exe
|
||||
|
|
@ -361,7 +379,7 @@ function create() {
|
|||
echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
|
||||
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
|
||||
sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v7 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v7 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
|
||||
|
||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
|
|
@ -373,7 +391,7 @@ function create() {
|
|||
echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat
|
||||
sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v8 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v8 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
|
||||
|
||||
# ==========================================================================================================
|
||||
|
|
@ -381,8 +399,8 @@ function create() {
|
|||
# ==========================================================================================================
|
||||
|
||||
mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
|
||||
sed 's/.*<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" arch="x86" >\n<check type="file" condition="notexist" path="%Windir%\\system32\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x86" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
sed 's/.*<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" >\n<check type="file" condition="notexist" path="%Windir%\\SysWOW64\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x64" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" arch="x86" >\n<check type="file" condition="notexist" path="%Windir%\\system32\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x86" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
sed -e 's/.*<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" >\n<check type="file" condition="notexist" path="%Windir%\\SysWOW64\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x64" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
||||
echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\system32\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
||||
|
|
|
|||
Loading…
Reference in New Issue