add sed for msvc workaround

builder-product.cfg

@@ -104,138 +104,138 @@ DL_FILE[0]="102791693_ff1cd10758.jpg"
 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_FILE[7]="aio-runtimes_v${VERSION}.7z"
-DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/69425/?download"
+DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/69425/?download"
-DL_ARCH[5]="X86"
+DL_ARCH[7]="X86"
-DL_EXTRACT_FORMAT[5]="7zip"
+DL_EXTRACT_FORMAT[7]="7zip"
-DL_EXTRACT_TO[5]="sereby"
+DL_EXTRACT_TO[7]="sereby"
 
   
 if [ "$USEWIN8ISO" = "1" ]; then
-  # The DL_FILE[6] is also used in the builder-target-cb.sh 
+  # The DL_FILE[8] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[6]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
+  DL_FILE[8]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
-  DL_SOURCE[6]="http://care.dlservice.microsoft.com//dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
+  DL_SOURCE[8]="http://care.dlservice.microsoft.com//dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
-  DL_ARCH[6]="X86"
+  DL_ARCH[8]="X86"
-  DL_WINST_NAME[6]=DotNet80Source
+  DL_WINST_NAME[8]=DotNet80Source
 
-  # The DL_FILE[7] is also used in the builder-target-cb.sh 
+  # The DL_FILE[9] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[7]="9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_DE-DE-IRM_CENA_X86FREE_DE-DE_DV5.ISO"
+  DL_FILE[9]="9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_DE-DE-IRM_CENA_X86FREE_DE-DE_DV5.ISO"
-  DL_SOURCE[7]="http://care.dlservice.microsoft.com/dl/download/1/B/E/1BEDF444-0504-4694-A738-4005AAD16887/9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_DE-DE-IRM_CENA_X86FREE_DE-DE_DV5.ISO"
+  DL_SOURCE[9]="http://care.dlservice.microsoft.com/dl/download/1/B/E/1BEDF444-0504-4694-A738-4005AAD16887/9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_DE-DE-IRM_CENA_X86FREE_DE-DE_DV5.ISO"
-  DL_ARCH[7]="X86"
+  DL_ARCH[9]="X86"
-  DL_WINST_NAME[7]=DotNet81Source
+  DL_WINST_NAME[9]=DotNet81Source
 else
-  # The DL_FILE[6] is also used in the builder-target-cb.sh 
+  # The DL_FILE[8] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[6]="dotNetFx3.5_8.0.7z"
+  DL_FILE[8]="dotNetFx3.5_8.0.7z"
-  DL_SOURCE[6]="file://"
+  DL_SOURCE[8]="file://"
-  DL_ARCH[6]="X86"
+  DL_ARCH[8]="X86"
-  DL_WINST_NAME[6]=DotNet80Source
+  DL_WINST_NAME[8]=DotNet80Source
 
-  # The DL_FILE[7] is also used in the builder-target-cb.sh 
+  # The DL_FILE[9] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[7]="dotNetFx3.5_8.1.7z"
+  DL_FILE[9]="dotNetFx3.5_8.1.7z"
-  DL_SOURCE[7]="file://"
+  DL_SOURCE[9]="file://"
-  DL_ARCH[7]="X86"
+  DL_ARCH[9]="X86"
-  DL_WINST_NAME[7]=DotNet81Source
+  DL_WINST_NAME[9]=DotNet81Source
 fi
 
-DL_FILE[8]="air_${AIRVERSION}_win.exe"
+DL_FILE[10]="air_${AIRVERSION}_win.exe"
-#DL_SOURCE[8]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-9_win.exe"
+#DL_SOURCE[10]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-9_win.exe"
-DL_SOURCE[8]="http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRInstaller.exe"
+DL_SOURCE[10]="http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRInstaller.exe"
-DL_ARCH[8]="X86"
-DL_WINST_NAME[8]=AdobeAirInstallExe
-
-DL_FILE[9]="7zsd_extra_150_2712.7z"
-DL_SOURCE[9]="http://www.7zsfx.info/files/7zsd_extra_150_2712.7z"
-DL_ARCH[9]="X86"
-DL_EXTRACT_FORMAT[9]="7zip"
-DL_EXTRACT_TO[9]="7ZipSFX"
-
-DL_FILE[10]="jre7u${JREUVERSION}-x86.exe"
-DL_SOURCE[10]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383"
 DL_ARCH[10]="X86"
-DL_WINST_NAME[10]=InstallJre32Exe
+DL_WINST_NAME[10]=AdobeAirInstallExe
 
-DL_FILE[11]="jre7u${JREUVERSION}-x64.exe"
+DL_FILE[11]="7zsd_extra_150_2712.7z"
-DL_SOURCE[11]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385"
+DL_SOURCE[11]="http://www.7zsfx.info/files/7zsd_extra_150_2712.7z"
 DL_ARCH[11]="X86"
-DL_WINST_NAME[11]=InstallJre64Exe
+DL_EXTRACT_FORMAT[11]="7zip"
+DL_EXTRACT_TO[11]="7ZipSFX"
 
-DL_FILE[12]="install_flash_player-${FLASHVERSION}.exe"
+DL_FILE[12]="jre7u${JREUVERSION}-x86.exe"
-DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
+DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383"
 DL_ARCH[12]="X86"
-DL_WINST_NAME[12]=InstallFlashExe
+DL_WINST_NAME[12]=InstallJre32Exe
 
-DL_FILE[13]="install_flash_player_ax-${FLASHAXVERSION}.exe"
+DL_FILE[13]="jre7u${JREUVERSION}-x64.exe"
-DL_SOURCE[13]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHAXVERSION}/install_flash_player_ax.exe"
+DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385"
 DL_ARCH[13]="X86"
-DL_WINST_NAME[13]=InstallFlashIeExe
+DL_WINST_NAME[13]=InstallJre64Exe
 
-DL_FILE[14]="sw_lic_full_installer-${SHOCKVERSION}.msi"
+DL_FILE[14]="install_flash_player-${FLASHVERSION}.exe"
-DL_SOURCE[14]="http://ricktendo.info/Repack/sw_lic_full_installer.msi"
+DL_SOURCE[14]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
-#DL_SOURCE[14]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
 DL_ARCH[14]="X86"
-DL_WINST_NAME[14]=InstallShockMsi
+DL_WINST_NAME[14]=InstallFlashExe
 
-DL_FILE[15]="Silverlight-${SILVERVERSION}.exe"
+DL_FILE[15]="install_flash_player_ax-${FLASHAXVERSION}.exe"
-DL_SOURCE[15]="http://silverlight.dlservice.microsoft.com/download/6/B/8/6B885B0B-73D4-4BCE-BFFF-154B4A402D22/20913.00/Silverlight.exe"
+DL_SOURCE[15]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHAXVERSION}/install_flash_player_ax.exe"
 DL_ARCH[15]="X86"
-DL_WINST_NAME[15]=InstallSilver32Exe
+DL_WINST_NAME[15]=InstallFlashIeExe
 
-DL_FILE[16]="Silverlight_x64-${SILVERVERSION}.exe"
+DL_FILE[16]="sw_lic_full_installer-${SHOCKVERSION}.msi"
-DL_SOURCE[16]="http://silverlight.dlservice.microsoft.com/download/6/B/8/6B885B0B-73D4-4BCE-BFFF-154B4A402D22/20913.00/Silverlight_x64.exe"
+DL_SOURCE[16]="http://ricktendo.info/Repack/sw_lic_full_installer.msi"
+#DL_SOURCE[16]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
 DL_ARCH[16]="X86"
-DL_WINST_NAME[16]=InstallSilver64Exe
+DL_WINST_NAME[16]=InstallShockMsi
 
-DL_FILE[17]="unlocker1.9.0-portable.zip"
+DL_FILE[17]="Silverlight-${SILVERVERSION}.exe"
-DL_SOURCE[17]="file:///home/mario/Downloads/unlocker1.9.0-portable.zip"
+DL_SOURCE[17]="http://silverlight.dlservice.microsoft.com/download/6/B/8/6B885B0B-73D4-4BCE-BFFF-154B4A402D22/20913.00/Silverlight.exe"
 DL_ARCH[17]="X86"
-DL_EXTRACT_TO[17]="Unlocker"
+DL_WINST_NAME[17]=InstallSilver32Exe
-DL_EXTRACT_FORMAT[17]="7zip"
 
-DL_FILE[18]="VBCFJRedist_AIO_x86_x64_${RICKTENDOAIO}.exe"
+DL_FILE[18]="Silverlight_x64-${SILVERVERSION}.exe"
-DL_SOURCE[18]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
+DL_SOURCE[18]="http://silverlight.dlservice.microsoft.com/download/6/B/8/6B885B0B-73D4-4BCE-BFFF-154B4A402D22/20913.00/Silverlight_x64.exe"
 DL_ARCH[18]="X86"
-DL_WINST_NAME[18]=RicktendoAioExe
+DL_WINST_NAME[18]=InstallSilver64Exe
 
-# The DL_FILE[19] - DL_FILE[22] is also used in the builder-target-cb.sh 
+DL_FILE[19]="unlocker1.9.0-portable.zip"
-# if you change also change there
+DL_SOURCE[19]="file:///home/mario/Downloads/unlocker1.9.0-portable.zip"
-DL_FILE[19]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_SOURCE[19]="http://ricktendo.info/Repack/dotNetFx40_Full_x86_x64_Slim.exe"
 DL_ARCH[19]="X86"
-DL_WINST_NAME[19]=RicktendoNet40Exe
+DL_EXTRACT_TO[19]="Unlocker"
+DL_EXTRACT_FORMAT[19]="7zip"
 
-DL_FILE[20]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_FILE[20]="VBCFJRedist_AIO_x86_x64_${RICKTENDOAIO}.exe"
-DL_SOURCE[20]="http://ricktendo.info/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
+DL_SOURCE[20]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
 DL_ARCH[20]="X86"
-DL_WINST_NAME[20]=RicktendoNet40Lang
+DL_WINST_NAME[20]=RicktendoAioExe
 
-#DL_FILE[21]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
+# The DL_FILE[21] - DL_FILE[22] is also used in the builder-target-cb.sh 
-DL_FILE[21]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
+# if you change also change there
-DL_SOURCE[21]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe"
+DL_FILE[21]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
+DL_SOURCE[21]="http://ricktendo.info/Repack/dotNetFx40_Full_x86_x64_Slim.exe"
 DL_ARCH[21]="X86"
-DL_WINST_NAME[21]=Ricktendo45Exe
+DL_WINST_NAME[21]=RicktendoNet40Exe
 
-DL_FILE[22]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_FILE[22]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
-DL_SOURCE[22]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z"
+DL_SOURCE[22]="http://ricktendo.info/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
 DL_ARCH[22]="X86"
-DL_WINST_NAME[22]=RicktendoNet45Lang
+DL_WINST_NAME[22]=RicktendoNet40Lang
 
-# General Runtimes
+#DL_FILE[23]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_FILE[23]="geos_one-general-runtimes_${GENERALVERSION}.7z"
+DL_FILE[23]="dotNetFx451_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_SOURCE[23]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
+DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx451_Full_LDR_x86_x64_Slim.exe"
 DL_ARCH[23]="X86"
-DL_EXTRACT_FORMAT[23]="7zip"
+DL_WINST_NAME[23]=Ricktendo45Exe
-DL_EXTRACT_TO[23]="Basic"
+
+DL_FILE[24]="dotNetFx451LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx451LP_Full_LDR_x86_x64de_Slim.7z"
+DL_ARCH[24]="X86"
+DL_WINST_NAME[24]=RicktendoNet45Lang
 
 # General Runtimes
-DL_FILE[24]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
+DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z"
-DL_SOURCE[24]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
+DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
-DL_ARCH[24]="X86"
+DL_ARCH[25]="X86"
-DL_EXTRACT_FORMAT[24]="7zip"
+DL_EXTRACT_FORMAT[25]="7zip"
-DL_EXTRACT_TO[24]="MSVC"
+DL_EXTRACT_TO[25]="Basic"
+
+# General Runtimes
+DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
+DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
+DL_ARCH[26]="X86"
+DL_EXTRACT_FORMAT[26]="7zip"
+DL_EXTRACT_TO[26]="MSVC"
 
 ##################
 ### Uninstallers
@@ -263,6 +263,18 @@ DL_SOURCE[4]="http://fpdownload.macromedia.com/get/shockwave/uninstall/win/sw_un
 DL_ARCH[4]="X86"
 DL_WINST_NAME[4]=UninstallShockExe
 
+DL_FILE[5]="sed-4.2.1-bin.zip"
+DL_SOURCE[5]="http://sourceforge.net/projects/gnuwin32/files//sed/4.2.1/sed-4.2.1-bin.zip"
+DL_ARCH[5]="X86"
+DL_EXTRACT_FORMAT[5]="unzip"
+DL_EXTRACT_TO[5]="sed"
+
+DL_FILE[6]="sed-4.2.1-dep.zip"
+DL_SOURCE[6]="http://sourceforge.net/projects/gnuwin32/files//sed/4.2.1/sed-4.2.1-dep.zip"
+DL_ARCH[6]="X86"
+DL_EXTRACT_FORMAT[6]="unzip"
+DL_EXTRACT_TO[6]="sed"
+
 
 ##################
 ### Compat Opsi Template entries

builder-targets-cb.sh

@@ -90,8 +90,8 @@ function create() {
   # ==========================================================================================================
   
   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 -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[8]}
-  7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]}
+  7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[9]}
   # 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
   
@@ -239,6 +239,7 @@ 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
+    mv -v $INST_DIR/CLIENT_DATA/X86/sed/bin $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/sed
     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

sed-4.2.1-bin.zip.sha1sum

@@ -0,0 +1 @@
+dfd3d1dae27a24784d7ab40eb074196509fa48fe  /home/mario/.opsi-dist-cache/sereby.aio-2.1.0.1/X86/sed-4.2.1-bin.zip

sed-4.2.1-dep.zip.sha1sum

@@ -0,0 +1 @@
+f7edbd7152d8720c95d46dd128b87b8ba48a5d6f  /home/mario/.opsi-dist-cache/sereby.aio-2.1.0.1/X86/sed-4.2.1-dep.zip