diff --git a/Dimpel-aio-runtimes_v2.0.7.2.7z.sha1sum b/Dimpel-aio-runtimes_v2.0.7.2.7z.sha1sum new file mode 100644 index 0000000..fdf8068 --- /dev/null +++ b/Dimpel-aio-runtimes_v2.0.7.2.7z.sha1sum @@ -0,0 +1 @@ +b0b6e3561887feea686ae6e8c2aeab166952124e /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/Dimpel-aio-runtimes_v2.0.7.2.7z diff --git a/builder-product.cfg b/builder-product.cfg index 8c5342a..9bdd0a2 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -124,7 +124,8 @@ DL_EXTRACT_TO[17]="Unlocker" DL_EXTRACT_FORMAT[17]="7zip" RICKTENDOAIO="2013.8.22" -RICKTENDOAIOUPDATE="1" +RICKTENDOMSVCUPDATE="0" +RICKTENDOJSHARPUPDATE="1" MSVC2005VER="8.00.50727.6229" MSVC2008VER="9.00.30729.7523" @@ -136,6 +137,15 @@ DL_SOURCE[18]="http://brianspcrepair.com/ricktendo/Setup/VBCFJRedist_AIO_x86_x64 DL_ARCH[18]="X86" DL_WINST_NAME[18]=RicktendoAioExe +MSVBVERSION="11.0.60610.1" + +# Dimple pack für deutsches msvb +DL_FILE[19]="Dimpel-aio-runtimes_v${VERSION}.7z" +DL_SOURCE[19]="http://german-unattended.de/~dimpel/Addons/aio-runtimes_v${VERSION}.7z" +DL_ARCH[19]="X86" +DL_EXTRACT_TO[19]="Dimpel" +DL_EXTRACT_FORMAT[19]="7zip" + ################## ### Uninstallers ################## diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index bdf8800..f2fb4ac 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -55,6 +55,9 @@ 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[18]} + # extract Dimpel AIO now so the unix2dos dont change the extracted files + 7z x -o$INST_DIR/CLIENT_DATA/X86/Dimpel $INST_DIR/CLIENT_DATA/X86/Dimpel/svcpack/aio-runtimes.exe + # move the Windows 8 dotnet 2 - 3.5 in place mv -v $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.X @@ -200,7 +203,7 @@ function create() { fi # MSCV & J/F Sharp - if [ "$RICKTENDOAIOUPDATE" = "1" ]; then + if [ "$RICKTENDOMSVCUPDATE" = "1" ]; then rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/* mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/20* $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/ mv -v $INST_DIR/CLIENT_DATA/Ricktendo_VC_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml @@ -208,14 +211,17 @@ function create() { sed "/msdia90.dll/ s!.\..\......\.....!${MSVC2008VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml sed "/msdia100.dll/ s!..\..\......\..!${MSVC2010VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml sed "/atl110.dll/ s!..\..\......\..!${MSVC2012VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml + fi + if [ "$RICKTENDOJSHARPUPDATE" = "1" ]; then rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/* mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/*sharp $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/ mv -v $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/package.xml fi + # Integrate MS VB & C Runtimes from Dimpel mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/MSVB - mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/extra.exe $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/ + mv $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/BasicRuntimes/extra.exe $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/ mv -v $INST_DIR/CLIENT_DATA/Ricktendo_VB_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/package.xml sed 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml sed "s!.\..\..\....!${MSVBVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/package.xml