From 3c43fd46f528f69f9cf8118bb218a46b9b89e320 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 20 Sep 2013 07:37:37 +0200 Subject: [PATCH] Bump sereby --- 2 | 1 + Silverlight-5.1.20513.0.exe.sha1sum | 2 +- Silverlight_x64-5.1.20513.0.exe.sha1sum | 2 +- aio-runtimes_v2.0.7.3.7z.sha1sum | 1 - aio-runtimes_v2.0.8.1.7z.sha1sum | 1 + air_3.9.0.790_win.exe.sha1sum | 1 - air_3.9.0.880_win.exe.sha1sum | 1 + builder-product.cfg | 26 +- builder-targets-cb.sh | 661 +++++++++--------- ...ne-general-runtimes_1.1.0.5-go1.7z.sha1sum | 1 - ...ne-general-runtimes_1.1.0.7-go1.7z.sha1sum | 1 + ...e-microsoft-msvc_2013.09.17-go2.7z.sha1sum | 2 +- install_flash_player-11.8.800.168.exe.sha1sum | 2 +- ...l_flash_player_ax-11.8.800.168.exe.sha1sum | 1 - ...l_flash_player_ax-11.8.800.174.exe.sha1sum | 1 + jre7u40-x64.exe.sha1sum | 2 +- jre7u40-x86.exe.sha1sum | 2 +- ..._lic_full_installer-12.0.4.144.msi.sha1sum | 2 +- ...tall_flash_player-11.8.800.168.exe.sha1sum | 2 +- ...nstall_shock_player-12.0.4.144.exe.sha1sum | 2 +- 20 files changed, 374 insertions(+), 340 deletions(-) create mode 100644 2 delete mode 100644 aio-runtimes_v2.0.7.3.7z.sha1sum create mode 100644 aio-runtimes_v2.0.8.1.7z.sha1sum delete mode 100644 air_3.9.0.790_win.exe.sha1sum create mode 100644 air_3.9.0.880_win.exe.sha1sum delete mode 100644 geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum create mode 100644 geos_one-general-runtimes_1.1.0.7-go1.7z.sha1sum delete mode 100644 install_flash_player_ax-11.8.800.168.exe.sha1sum create mode 100644 install_flash_player_ax-11.8.800.174.exe.sha1sum rename sw_lic_full_installer-12.0.4r144.msi.sha1sum => sw_lic_full_installer-12.0.4.144.msi.sha1sum (51%) rename uninstall_shock_player-12.0.4r144.exe.sha1sum => uninstall_shock_player-12.0.4.144.exe.sha1sum (51%) diff --git a/2 b/2 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/2 @@ -0,0 +1 @@ + diff --git a/Silverlight-5.1.20513.0.exe.sha1sum b/Silverlight-5.1.20513.0.exe.sha1sum index b27fd5f..b4ce8d8 100644 --- a/Silverlight-5.1.20513.0.exe.sha1sum +++ b/Silverlight-5.1.20513.0.exe.sha1sum @@ -1 +1 @@ -9537e817a99b2a1e2522fd60dbb85a3f4c5037c8 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/Silverlight-5.1.20513.0.exe +9537e817a99b2a1e2522fd60dbb85a3f4c5037c8 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/Silverlight-5.1.20513.0.exe diff --git a/Silverlight_x64-5.1.20513.0.exe.sha1sum b/Silverlight_x64-5.1.20513.0.exe.sha1sum index f519ceb..b181c87 100644 --- a/Silverlight_x64-5.1.20513.0.exe.sha1sum +++ b/Silverlight_x64-5.1.20513.0.exe.sha1sum @@ -1 +1 @@ -5791a4f1e1a399947079a2582046e6167ddb040d /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/Silverlight_x64-5.1.20513.0.exe +5791a4f1e1a399947079a2582046e6167ddb040d /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/Silverlight_x64-5.1.20513.0.exe diff --git a/aio-runtimes_v2.0.7.3.7z.sha1sum b/aio-runtimes_v2.0.7.3.7z.sha1sum deleted file mode 100644 index e505b46..0000000 --- a/aio-runtimes_v2.0.7.3.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -d7280a90f0e2d174f64222fc8841ce4de78c5704 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/aio-runtimes_v2.0.7.1.7z diff --git a/aio-runtimes_v2.0.8.1.7z.sha1sum b/aio-runtimes_v2.0.8.1.7z.sha1sum new file mode 100644 index 0000000..c2308f1 --- /dev/null +++ b/aio-runtimes_v2.0.8.1.7z.sha1sum @@ -0,0 +1 @@ +6aa39c2789ca479833f6a033907b7d99c8fd6c2a /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/aio-runtimes_v2.0.8.1.7z diff --git a/air_3.9.0.790_win.exe.sha1sum b/air_3.9.0.790_win.exe.sha1sum deleted file mode 100644 index 34ba760..0000000 --- a/air_3.9.0.790_win.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -0354a988909d13ffab696e48652f1f2188009e0e /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/air_3.9.0.790_win.exe diff --git a/air_3.9.0.880_win.exe.sha1sum b/air_3.9.0.880_win.exe.sha1sum new file mode 100644 index 0000000..9eb2cd6 --- /dev/null +++ b/air_3.9.0.880_win.exe.sha1sum @@ -0,0 +1 @@ +50fb14efa3733d857db00c07495e72174fd5f8ca /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/air_3.9.0.880_win.exe diff --git a/builder-product.cfg b/builder-product.cfg index 1071193..d444c98 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -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.0.7.3" +VERSION="2.0.8.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -20,13 +20,13 @@ CREATENEWSEREBY=1 # Adobe Air Verison # ================================== -AIRVERSION="3.9.0.790" +AIRVERSION="3.9.0.880" # ================================== # Update Java # ================================== -JREUPDATE="1" +JREUPDATE="0" JREUVERSION="40" JREVERSION="7.0.400.43" @@ -34,28 +34,29 @@ JREVERSION="7.0.400.43" # Update Adobe Flash # ================================== -FLASHUPDATE="1" +FLASHUPDATE="0" FLASHVERSION="11.8.800.168" +FLASHAXVERSION="11.8.800.174" # ================================== # Update Adobe Schockave # ================================== SHOCKUPDATE="1" -SHOCKVERSION="12.0.4r144" +SHOCKVERSION="12.0.4.144" # ================================== # Update Microsoft Silverlight # ================================== -SILVERUPDATE="1" +SILVERUPDATE="0" SILVERVERSION="5.1.20513.0" # ================================== # Take Parts of Ricktendo Update # ================================== -RICKTENDOJSHARPUPDATE="1" +RICKTENDOJSHARPUPDATE="0" RICKTENDOAIO="2013.8.22" # ================================== @@ -69,13 +70,14 @@ RICKTENDONET="2013.9.18" # ================================== # General Runtimes Verison # ================================== + GENERALUPDATE="1" -GENERALVERSION="1.1.0.5-go1" +GENERALVERSION="1.1.0.7-go1" # ================================== # MSVC Runtimes Verison # ================================== -MSVCUPDATE="1" +MSVCUPDATE="0" MSVCVERSION="2013.09.17-go2" @@ -96,7 +98,7 @@ DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg" ## 1: 32 & 64 Bit Runtimes DL_FILE[5]="aio-runtimes_v${VERSION}.7z" -DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/64076/?download" +DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/66247/?download" DL_ARCH[5]="X86" DL_EXTRACT_FORMAT[5]="7zip" DL_EXTRACT_TO[5]="sereby" @@ -151,8 +153,8 @@ DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSI DL_ARCH[12]="X86" DL_WINST_NAME[12]=InstallFlashExe -DL_FILE[13]="install_flash_player_ax-${FLASHVERSION}.exe" -DL_SOURCE[13]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe" +DL_FILE[13]="install_flash_player_ax-${FLASHAXVERSION}.exe" +DL_SOURCE[13]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHAXVERSION}/install_flash_player_ax.exe" DL_ARCH[13]="X86" DL_WINST_NAME[13]=InstallFlashIeExe diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index e20d066..58175b1 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -1,10 +1,10 @@ ############################################################################## -# This optional file "builder-targets-cb.sh" will be called by builder.sh -# +# This optional file "builder-targets-cb.sh" will be called by builder.sh +# # The targets will be called from thde opsi-builder using the following -# order: config, prepare, retrieve, create, package, publish, commit, cleanup +# order: config, prepare, retrieve, create, package, publish, commit, cleanup # You can overwrite the target functions in builder-targets-cb.sh -# +# # You can define callback functions. The functions are called from # opsi-builder within processing a target # cb_package_makeproductfile @@ -20,19 +20,19 @@ ############################################################################## function cleanup() { - echo "Cleanup" - builder_cleanup + echo "Cleanup" + builder_cleanup } function retrieve() { - echo "Retrieve" - # work around big file download for verison change - local olddir=`echo $DIST_CACHE_DIR | sed -e "s/\/[^\/]*$//"` - echo $olddir - mv $olddir/${PN}-* tempsereby - mv tempsereby $DIST_CACHE_DIR - builder_retrieve + echo "Retrieve" + # work around big file download for verison change + local olddir=`echo $DIST_CACHE_DIR | sed -e "s/\/[^\/]*$//"` + echo $olddir + mv $olddir/${PN}-* tempsereby + mv tempsereby $DIST_CACHE_DIR + builder_retrieve } write_svcpack_file() { @@ -45,307 +45,338 @@ write_svcpack_file() { } +patch_package_xml() { + local xml_file=$1 + local xml_path=$2 + local xml_value=$3 + + mv ${xml_file} ${xml_file}.old + cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | xmlstarlet ed -O -u "${xml_path}" -v "${xml_value}" | sed -e 's!>!>!g' -e 's!<! ${xml_file} + rm ${xml_file}.old +} + +tidy_xml() { + local xml_file=$1 + local xml_path=$2 + local xml_value=$3 + + echo ${xml_file} + mv ${xml_file} ${xml_file}.old + cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | sed -e 's!>!>!g' -e 's!<! ${xml_file} + rm ${xml_file}.old +} + + function create() { - echo "Create" - builder_create - -# ========================================================================================================== -# create directories and extract the runtime packages -# ========================================================================================================== - - mkdir -p $INST_DIR/CLIENT_DATA/{Install/Packages/BasicRuntimes,Install/Packages/Air,Config} - mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave,Silverlight} - 7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.exe - -# ========================================================================================================== -# 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 - -# ========================================================================================================== -# extract .net 8.0 & 8.1 now so the unix2dos dont change the extracted files -# ========================================================================================================== - - mkdir -p $INST_DIR/CLIENT_DATA/X86/win8xdotnet35 - 7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[6]} - 7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]} - # 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 - -# ========================================================================================================== -# extract Ricktendo AIO now so the unix2dos dont change the extracted files -# ========================================================================================================== - - 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]} - -# ========================================================================================================== -# Integrate .net for win 8.0 into winpkg -# ========================================================================================================== - - for NETVER in 2.0 3.0 3.5 - do - # convert all the cmd's to axept check entities - sed '/_Install.bat/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - sed '/NET Framework/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - # force a check on os verison for every cmd command - sed 's/.*\t<\/cmd>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - # remove the installer and package end tags - sed -e '/^\t<\/install>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - - # append the win 8.x install cmd via a cmd script that runs it - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - echo "\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - - # add back the install and package end tags - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml - - # create the needed install cmd script for win 8.x - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "echo Installing .NET Framwork $NETVER" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat - done - -# ========================================================================================================== -# Replace the General Runtimes with the Msi version off GeosOne -# ========================================================================================================== - - if [ "$GENERALUPDATE" = "1" ]; then - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes - mv -v $INST_DIR/CLIENT_DATA/X86/Basic $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/ - fi - -# ========================================================================================================== -# integrate Adobe AIR -# ========================================================================================================== - - mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_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\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml - sed "s!.\..\..\....!${AIRVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml - - # Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally - 7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_win.exe - cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe - rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z - -# ========================================================================================================== -# Update Java -# ========================================================================================================== - - if [ "$JREUPDATE" = "1" ]; then - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe - mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe - mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe - sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml - sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml - fi - sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml - -# ========================================================================================================== -# Update Flash -# ========================================================================================================== - - if [ "$FLASHUPDATE" = "1" ]; then - rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe - mv $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe - mv $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe - sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - fi - # sed force update on flash - sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - -# ========================================================================================================== -# Update Shockwave -# ========================================================================================================== - - if [ "$SHOCKUPDATE" = "1" ]; then - rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi - mv $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi - sed "s!..\..\..r...!${SHOCKVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml - sed "s!v12!v${SHOCKVERSION//r/.}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml - fi - -# ========================================================================================================== -# Update Silverlight -# ========================================================================================================== - - if [ "$SILVERUPDATE" = "1" ]; then - rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe - mv $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe - mv $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe - sed "s!.\..\......\..!${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml - sed "s!v5!v${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml - fi - -# ========================================================================================================== -# Update J Sharp and add F Sharp -# ========================================================================================================== - - if [ "$RICKTENDOJSHARPUPDATE" = "1" ]; then - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist - mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/vjsharp $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 - else - rm $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml - fi - - 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\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml - - -# ========================================================================================================== -# Update .NET 4.0 & 4.5 with Ricktendo -# ========================================================================================================== - - 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[19]} - #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[20]} - 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 - fi - - if [ "$RICKTENDONET45UPDATE" = "1" ]; then - rm -rf $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[21]} - #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]} - 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 - fi - -# ========================================================================================================== -# Update MSVC -# ========================================================================================================== - - if [ "$MSVCUPDATE" = "1" ]; then - rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC - mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC - fi - - -# ========================================================================================================== -# move the uninstallers in place (directory layout like the sereby package) -# ========================================================================================================== - - mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE - mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE - mv -v $INST_DIR/CLIENT_DATA/CleanSilverlight.cmd $INST_DIR/CLIENT_DATA/UnInstall/Packages/Silverlight - mv -v $INST_DIR/CLIENT_DATA/X86/dotnet $INST_DIR/CLIENT_DATA/UnInstall/NET - mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash/uninstall_flash_player.exe - mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player-${SHOCKVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave/uninstall_shock_player.exe - -# ========================================================================================================== -# move the opsi wrapper to the right dir (close the error window if nothing needs to be done) -# ========================================================================================================== - - mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/ - -# ========================================================================================================== -# Correct linefeed in config -# ========================================================================================================== - - unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml - -# ========================================================================================================== -# Create a new sereby aio pack -# ========================================================================================================== - - 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 - 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 - rm $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z - SVCDATE=`date +"%d.%m.%Y"` - write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "version" "${VERSION}" - write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "builddate" "${SVCDATE}" - write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "title" "Sereby's AiO Runtimes with Geos One's Mods" - write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "website" "http://opsi.disconnected-by-peer.at" - unix2dos $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini - mkdir -p $OPSI_REPOS_PRODUCT_DIR - 7z a $OPSI_REPOS_PRODUCT_DIR/$OPSI_REPOS_FILE_PATTERN.7z $INST_DIR/CLIENT_DATA/X86/sereby/* - fi - -# ========================================================================================================== -# correct sereby .net 3.5 for opsi use -# ========================================================================================================== - - # Serby and its hacks workaround (sereby pack wants to copy a file on install but thats not possible on a readonly device in opsi - # move the combined x86/x64 to a common name - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5 $INST_DIR/CLIENT_DATA/Install/NET/35 - # recreate the new dir - mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/3.5 - # move the common dir to the x86 name under the new dir - mv $INST_DIR/CLIENT_DATA/Install/NET/35 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86 - # remove the copy from the install.bat - sed -e '/^copy/d' -i $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/_Install.bat - # move the package.xml un dir up - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/package.xml $INST_DIR/CLIENT_DATA/Install/NET/3.5 - # now link copy the x86 dir to x64 - cp -al $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64 - # do the copy for x86 (seded away erlyer) - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup_x86.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup.msi - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup_x86.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup.sdb - # do the copy for x64 (seded away erlyer) - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup_x64.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup.msi - mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup_x64.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup.sdb - # create a new install.bat that calls the right setup from the right dir - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat - echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat - echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat - -# ========================================================================================================== -# Disable Java Update check -# ========================================================================================================== - - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat - echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat - echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat - # echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat - sed 's/.*\t<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml - -# ========================================================================================================== -# Disable Flash Update Check -# ========================================================================================================== - - mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg - sed 's/.*\t<\/install>.*/\t\t\n\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - sed 's/.*\t<\/install>.*/\t\t\n\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 - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat - echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\SysWOW64\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat - -# ========================================================================================================== -# Posthooks: change linefeed, Set exec bit, delete temp -# ========================================================================================================== - - find $INST_DIR/CLIENT_DATA -name *.bat -print0 | xargs -0 unix2dos - find $INST_DIR/CLIENT_DATA -name package.xml -print0 | xargs -0 unix2dos - - # set exec bit on executeables - find $INST_DIR/CLIENT_DATA/Install/ -type f -print0 | xargs -0 chmod +x - find $INST_DIR/CLIENT_DATA/UnInstall/ -type f -print0 | xargs -0 chmod +x - find $INST_DIR/CLIENT_DATA -type d -print0 | xargs -0 chmod 755 -v - - # delete the temp directory - rm -rf $INST_DIR/CLIENT_DATA/X86 + echo "Create" + builder_create + + # ========================================================================================================== + # create directories and extract the runtime packages + # ========================================================================================================== + + mkdir -p $INST_DIR/CLIENT_DATA/{Install/Packages/BasicRuntimes,Install/Packages/Air,Config} + mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave,Silverlight} + 7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.exe + + # ========================================================================================================== + # 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 + + # ========================================================================================================== + # extract .net 8.0 & 8.1 now so the unix2dos dont change the extracted files + # ========================================================================================================== + + mkdir -p $INST_DIR/CLIENT_DATA/X86/win8xdotnet35 + 7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[6]} + 7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]} + # 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 + + # ========================================================================================================== + # extract Ricktendo AIO now so the unix2dos dont change the extracted files + # ========================================================================================================== + + 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]} + + # ========================================================================================================== + # Integrate .net for win 8.0 into winpkg + # ========================================================================================================== + + for NETVER in 2.0 3.0 3.5 + do + # convert all the cmd's to axept check entities + sed '/_Install.bat/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + sed '/NET Framework/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + # force a check on os verison for every cmd command + sed 's/.*\t<\/cmd>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + # remove the installer and package end tags + sed -e '/^\t<\/install>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + + # append the win 8.x install cmd via a cmd script that runs it + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + echo "\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + + # add back the install and package end tags + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml + + # create the needed install cmd script for win 8.x + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "echo Installing .NET Framwork $NETVER" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat + done + + # ========================================================================================================== + # Replace the General Runtimes with the Msi version off GeosOne + # ========================================================================================================== + + if [ "$GENERALUPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes + mv -v $INST_DIR/CLIENT_DATA/X86/Basic $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/ + fi + + # ========================================================================================================== + # integrate Adobe AIR + # ========================================================================================================== + + mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_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\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}" + + + # Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally + 7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_win.exe + cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe + rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z + + # ========================================================================================================== + # Update Java + # ========================================================================================================== + + if [ "$JREUPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe + mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe + mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JREUVERSION}" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='BUILD']/@value" "${JREVERSION}" + fi + sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml + + + # ========================================================================================================== + # Update Flash + # ========================================================================================================== + + if [ "$FLASHUPDATE" = "1" ]; then + rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe + mv $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe + mv $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHAXVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION']/@value" "${FLASHVERSION}" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION_FILE']/@value" "${FLASHVERSION//./_}" + 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 + + # ========================================================================================================== + # Update Shockwave + # ========================================================================================================== + + sed 's!!' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml + sed 's/.*.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml + sed "s!SwHelper_.*\.exe!SwHelper_%VERSION_FILE%.exe!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml + + if [ "$SHOCKUPDATE" = "1" ]; then + rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi + mv $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package/variable[@name='VERSION_FILE']/@value" "${SHOCKVERSION//./}" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package[@id='AdobeShock']/@name" "Adobe Shockwave Player v${SHOCKVERSION}" + fi + + + # ========================================================================================================== + # Update Silverlight + # ========================================================================================================== + + if [ "$SILVERUPDATE" = "1" ]; then + rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe + mv $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe + mv $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml "/package/variable[@name='NAME']/@value" "Microsoft Silverlight v${SILVERVERSION}" + patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml "/package/variable[@name='VERSION']/@value" "${SILVERVERSION}" + fi + + # ========================================================================================================== + # Update J Sharp and add F Sharp + # ========================================================================================================== + + if [ "$RICKTENDOJSHARPUPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist + mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/vjsharp $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 + else + rm $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml + fi + + 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\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml + + # ========================================================================================================== + # Update .NET 4.0 & 4.5 with Ricktendo + # ========================================================================================================== + + 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[19]} + #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[20]} + 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 + fi + + if [ "$RICKTENDONET45UPDATE" = "1" ]; then + rm -rf $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[21]} + #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]} + 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 + fi + + # ========================================================================================================== + # Update MSVC + # ========================================================================================================== + + if [ "$MSVCUPDATE" = "1" ]; then + rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC + mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC + fi + + + # ========================================================================================================== + # move the uninstallers in place (directory layout like the sereby package) + # ========================================================================================================== + + mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE + mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE + mv -v $INST_DIR/CLIENT_DATA/CleanSilverlight.cmd $INST_DIR/CLIENT_DATA/UnInstall/Packages/Silverlight + mv -v $INST_DIR/CLIENT_DATA/X86/dotnet $INST_DIR/CLIENT_DATA/UnInstall/NET + mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash/uninstall_flash_player.exe + mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player-${SHOCKVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave/uninstall_shock_player.exe + + # ========================================================================================================== + # move the opsi wrapper to the right dir (close the error window if nothing needs to be done) + # ========================================================================================================== + + mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/ + + # ========================================================================================================== + # Correct linefeed in config + # ========================================================================================================== + + unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml + + # ========================================================================================================== + # Create a new sereby aio pack + # ========================================================================================================== + + 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 + 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 + rm $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z + SVCDATE=`date +"%d.%m.%Y"` + write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "version" "${VERSION}" + write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "builddate" "${SVCDATE}" + write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "title" "Sereby's AiO Runtimes with Geos One's Mods" + write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "website" "http://opsi.disconnected-by-peer.at" + unix2dos $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini + mkdir -p $OPSI_REPOS_PRODUCT_DIR + 7z a $OPSI_REPOS_PRODUCT_DIR/$OPSI_REPOS_FILE_PATTERN.7z $INST_DIR/CLIENT_DATA/X86/sereby/* + fi + + # ========================================================================================================== + # correct sereby .net 3.5 for opsi use + # ========================================================================================================== + + # Serby and its hacks workaround (sereby pack wants to copy a file on install but thats not possible on a readonly device in opsi + # move the combined x86/x64 to a common name + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5 $INST_DIR/CLIENT_DATA/Install/NET/35 + # recreate the new dir + mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/3.5 + # move the common dir to the x86 name under the new dir + mv $INST_DIR/CLIENT_DATA/Install/NET/35 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86 + # remove the copy from the install.bat + sed -e '/^copy/d' -i $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/_Install.bat + # move the package.xml un dir up + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/package.xml $INST_DIR/CLIENT_DATA/Install/NET/3.5 + # now link copy the x86 dir to x64 + cp -al $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64 + # do the copy for x86 (seded away erlyer) + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup_x86.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup.msi + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup_x86.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup.sdb + # do the copy for x64 (seded away erlyer) + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup_x64.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup.msi + mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup_x64.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup.sdb + # create a new install.bat that calls the right setup from the right dir + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat + echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat + echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat + + # ========================================================================================================== + # Disable Java Update check + # ========================================================================================================== + + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat + echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat + echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat + # echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat + sed 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml + + # ========================================================================================================== + # Disable Flash Update Check + # ========================================================================================================== + + mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg + sed 's/.*<\/install>.*/\t\t\n\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml + sed 's/.*<\/install>.*/\t\t\n\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 + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat + echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\SysWOW64\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat + + # ========================================================================================================== + # Posthooks: change linefeed, Set exec bit, delete temp + # ========================================================================================================== + + find $INST_DIR/CLIENT_DATA -name *.bat -print0 | xargs -0 unix2dos + find $INST_DIR/CLIENT_DATA -name package.xml -print0 | xargs -0 unix2dos + + # set exec bit on executeables + find $INST_DIR/CLIENT_DATA/Install/ -type f -print0 | xargs -0 chmod +x + find $INST_DIR/CLIENT_DATA/UnInstall/ -type f -print0 | xargs -0 chmod +x + find $INST_DIR/CLIENT_DATA -type d -print0 | xargs -0 chmod 755 -v + + # delete the temp directory + rm -rf $INST_DIR/CLIENT_DATA/X86 } \ No newline at end of file diff --git a/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum deleted file mode 100644 index 77040fb..0000000 --- a/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -bda89a613f1769c8d915ae409173419100de15c5 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.3/X86/geos_one-general-runtimes_1.1.0.5-go1.7z diff --git a/geos_one-general-runtimes_1.1.0.7-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.7-go1.7z.sha1sum new file mode 100644 index 0000000..60119c2 --- /dev/null +++ b/geos_one-general-runtimes_1.1.0.7-go1.7z.sha1sum @@ -0,0 +1 @@ +9f949b362456358516b50af2dad2f7717e61bdfb /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/geos_one-general-runtimes_1.1.0.7-go1.7z diff --git a/geos_one-microsoft-msvc_2013.09.17-go2.7z.sha1sum b/geos_one-microsoft-msvc_2013.09.17-go2.7z.sha1sum index db748b6..f0e8ed0 100644 --- a/geos_one-microsoft-msvc_2013.09.17-go2.7z.sha1sum +++ b/geos_one-microsoft-msvc_2013.09.17-go2.7z.sha1sum @@ -1 +1 @@ -00920629df01149e416d4d17067597ff29cc0baf /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.3/X86/geos_one-microsoft-msvc_2013.09.17-go2.7z +00920629df01149e416d4d17067597ff29cc0baf /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/geos_one-microsoft-msvc_2013.09.17-go2.7z diff --git a/install_flash_player-11.8.800.168.exe.sha1sum b/install_flash_player-11.8.800.168.exe.sha1sum index 7a5861f..72e1883 100644 --- a/install_flash_player-11.8.800.168.exe.sha1sum +++ b/install_flash_player-11.8.800.168.exe.sha1sum @@ -1 +1 @@ -ff2a6d5a2176582ba50a81d665636fb756f7e993 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/install_flash_player-11.8.800.168.exe +ff2a6d5a2176582ba50a81d665636fb756f7e993 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/install_flash_player-11.8.800.168.exe diff --git a/install_flash_player_ax-11.8.800.168.exe.sha1sum b/install_flash_player_ax-11.8.800.168.exe.sha1sum deleted file mode 100644 index 99b1c66..0000000 --- a/install_flash_player_ax-11.8.800.168.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -6e3d94ecc5d972994aaa0dfb7ada2263ddb29594 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/install_flash_player_ax-11.8.800.168.exe diff --git a/install_flash_player_ax-11.8.800.174.exe.sha1sum b/install_flash_player_ax-11.8.800.174.exe.sha1sum new file mode 100644 index 0000000..c0449df --- /dev/null +++ b/install_flash_player_ax-11.8.800.174.exe.sha1sum @@ -0,0 +1 @@ +f9f3711ce7e03842247289ebe308e49a2a360823 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/install_flash_player_ax-11.8.800.174.exe diff --git a/jre7u40-x64.exe.sha1sum b/jre7u40-x64.exe.sha1sum index bd7c57a..362b751 100644 --- a/jre7u40-x64.exe.sha1sum +++ b/jre7u40-x64.exe.sha1sum @@ -1 +1 @@ -85c7db9a1c432a119c90d1d1b203ccaaedae3444 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/jre7u40-x64.exe +85c7db9a1c432a119c90d1d1b203ccaaedae3444 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/jre7u40-x64.exe diff --git a/jre7u40-x86.exe.sha1sum b/jre7u40-x86.exe.sha1sum index c69f866..652f5a2 100644 --- a/jre7u40-x86.exe.sha1sum +++ b/jre7u40-x86.exe.sha1sum @@ -1 +1 @@ -c0429dca47c0f22bbcd33492f39117245bab515d /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/jre7u40-x86.exe +c0429dca47c0f22bbcd33492f39117245bab515d /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/jre7u40-x86.exe diff --git a/sw_lic_full_installer-12.0.4r144.msi.sha1sum b/sw_lic_full_installer-12.0.4.144.msi.sha1sum similarity index 51% rename from sw_lic_full_installer-12.0.4r144.msi.sha1sum rename to sw_lic_full_installer-12.0.4.144.msi.sha1sum index aebd014..51a929c 100644 --- a/sw_lic_full_installer-12.0.4r144.msi.sha1sum +++ b/sw_lic_full_installer-12.0.4.144.msi.sha1sum @@ -1 +1 @@ -161cb479da71977a814298d39322dd0528805979 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/sw_lic_full_installer-12.0.4r144.msi +161cb479da71977a814298d39322dd0528805979 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/sw_lic_full_installer-12.0.4.144.msi diff --git a/uninstall_flash_player-11.8.800.168.exe.sha1sum b/uninstall_flash_player-11.8.800.168.exe.sha1sum index e1b9c25..c8f1b40 100644 --- a/uninstall_flash_player-11.8.800.168.exe.sha1sum +++ b/uninstall_flash_player-11.8.800.168.exe.sha1sum @@ -1 +1 @@ -f1460b13252c91530d7f2104f1b1d6c2d4492efe /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/uninstall_flash_player-11.8.800.168.exe +eb76a95d6c3e13b9682a9410f46d1cb288f00f57 /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/uninstall_flash_player-11.8.800.168.exe diff --git a/uninstall_shock_player-12.0.4r144.exe.sha1sum b/uninstall_shock_player-12.0.4.144.exe.sha1sum similarity index 51% rename from uninstall_shock_player-12.0.4r144.exe.sha1sum rename to uninstall_shock_player-12.0.4.144.exe.sha1sum index c200867..b23975b 100644 --- a/uninstall_shock_player-12.0.4r144.exe.sha1sum +++ b/uninstall_shock_player-12.0.4.144.exe.sha1sum @@ -1 +1 @@ -4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/uninstall_shock_player-12.0.4r144.exe +4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario/.opsi-dist-cache/sereby.aio-2.0.8.1/X86/uninstall_shock_player-12.0.4.144.exe