From aaf15aa06263569c2c76730c290dc8d423096435 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 27 Jul 2013 15:05:13 +0200
Subject: [PATCH] redesign to only have one install tag

---
 builder-targets-cb.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 79ec005..d01951f 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -73,22 +73,20 @@ function create() {
     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
 
-    # disable std .net installers on win8+
-    for NETVER in 1.1 2.0 3.0 3.5
-    do
-	sed 's/.*\t<\/install>.*/\t\t<check type="os"   condition="<" value="6.2.9200.0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    done
-
     # Integrate .net for win8.0 into winpkg
     for NETVER in 2.0 3.0 3.5
     do
+	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
+	sed 's/.*\t<\/cmd>.*/\t\t<check type="os"   condition="<" value="6.2.9200.0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
 	sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-	echo "<install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-	echo "<cmd path=\"_Install80.bat\"   />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-#	echo "<check type=\"file\" condition=\"notexist\" path=\"%Windir%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
+	sed -e '/^\t<\/install>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
+	echo "<cmd path=\"_Install80.bat\" >" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
 	echo "<check type=\"os\"   condition=\">=\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
+	echo "</cmd>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
 	echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
 	echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
+
 	echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
 	echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%~dp0\..\WIN8.0 /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
     done