From 485d19a969f7ed76af6eac153a98869fa7d7508b Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 17 Sep 2013 09:09:02 +0200
Subject: [PATCH] update 2012 to update 4 RC & 2013 to RC

---
 0                            |  0
 builder-product.cfg          |  4 ++--
 builder-targets-cb.sh        | 17 +++++++++--------
 vcredist2012_x64.exe.sha1sum |  2 +-
 vcredist2012_x86.exe.sha1sum |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 0

diff --git a/0 b/0
new file mode 100644
index 0000000..e69de29
diff --git a/builder-product.cfg b/builder-product.cfg
index c8e1ffa..37bd678 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -65,13 +65,13 @@ DL_EXTRACT_FORMAT[7]="7zip"
 DL_EXTRACT_TO[7]="2010"
 
 DL_FILE[8]="vcredist2012_x86.exe"
-DL_SOURCE[8]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x86.exe"
+DL_SOURCE[8]="http://download.microsoft.com/download/F/A/4/FA40793F-850A-4740-B6FC-7F4A91F605FB/vcredist_x86.exe"
 DL_ARCH[8]="x86"
 DL_EXTRACT_FORMAT[8]="cp"
 DL_EXTRACT_TO[8]="2012"
 
 DL_FILE[9]="vcredist2012_x64.exe"
-DL_SOURCE[9]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x64.exe"
+DL_SOURCE[9]="http://download.microsoft.com/download/F/A/4/FA40793F-850A-4740-B6FC-7F4A91F605FB/vcredist_x64.exe"
 DL_ARCH[9]="x64"
 DL_EXTRACT_FORMAT[9]="cp"
 DL_EXTRACT_TO[9]="2012"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 263344c..e2fda11 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -160,21 +160,21 @@ function create() {
   echo "msvc 2012 Additional x86 $vc2010ver_mfc_x86"
   echo "msvc 2012 Additional x64 $vc2010ver_mfc_x64"
   
-  echo "<cmd name=\"%NAME% 2012 Minimum\" path=\"x86\2012\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2012 Minimum\" path=\"x86\2012\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd name=\"%NAME% 2012 Additional\" path=\"x86\2012\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2012 Additional\" path=\"x86\2012\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Minimum x64\" path=\"x64\2012\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Minimum x64\" path=\"x64\2012\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Additional x64\" path=\"x64\2012\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Additional x64\" path=\"x64\2012\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
@@ -201,21 +201,21 @@ function create() {
   echo "msvc 2013 Additional x86 $vc2013ver_mfc_x86"
   echo "msvc 2013 Additional x64 $vc2013ver_mfc_x64"
   
-  echo "<cmd name=\"%NAME% 2013 Minimum\" path=\"x86\2013\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2013 Minimum\" path=\"x86\2013\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd name=\"%NAME% 2013 Additional\" path=\"x86\2013\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2013 Additional\" path=\"x86\2013\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Minimum x64\" path=\"x64\2013\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Minimum x64\" path=\"x64\2013\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Additional x64\" path=\"x64\2013\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Additional x64\" path=\"x64\2013\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
@@ -230,5 +230,6 @@ function create() {
   
   tidy_xml $INST_DIR/package.old $INST_DIR/package.xml
   rm $INST_DIR/package.old
+#  exit 1
 }
 
diff --git a/vcredist2012_x64.exe.sha1sum b/vcredist2012_x64.exe.sha1sum
index 426efb9..201f260 100644
--- a/vcredist2012_x64.exe.sha1sum
+++ b/vcredist2012_x64.exe.sha1sum
@@ -1 +1 @@
-c4ac45564e801e1bfd87936cac8a76c5754cdbd4 */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.09/x64/vcredist2012_x64.exe
+d918c224026ab33ac0634dd31ac434332118bb7f */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.17/x64/vcredist2012_x64.exe
diff --git a/vcredist2012_x86.exe.sha1sum b/vcredist2012_x86.exe.sha1sum
index 3683261..dcdc0c3 100644
--- a/vcredist2012_x86.exe.sha1sum
+++ b/vcredist2012_x86.exe.sha1sum
@@ -1 +1 @@
-7d6f654c16f9ce534bb2c4b1669d7dc039c433c9 */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.09/x86/vcredist2012_x86.exe
+6c77bc6f03a25845feb9ecbfb07480fd80867485 */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.17/x86/vcredist2012_x86.exe