From 1d4119950172d8d65ba24e3c7ae146a89fdf5ec9 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 10:55:20 +0000
Subject: [PATCH 1/6] Move Wintun to separate feature

---
 contrib/msi/build-msi.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index cfa2728d..cf69d6bf 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -177,13 +177,16 @@ cat > wix.xml << EOF
         SourceFile="${PKGMSMNAME}" />
     </Directory>
 
-    <Feature Id="Complete" Level="1">
-      <MergeRef Id="Wintun" />
+    <Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1">
       <ComponentRef Id="MainExecutable" />
       <ComponentRef Id="CtrlExecutable" />
       <ComponentRef Id="ConfigScript" />
     </Feature>
 
+    <Feature Id="WintunFeature" Title="Wintun" Level="1">
+      <MergeRef Id="Wintun" />
+    </Feature>
+
     <CustomAction
       Id="UpdateGenerateConfig"
       Directory="YggdrasilInstallFolder"

From 152f5838f81d8b3992f3249b32185e37d45adf21 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:17:15 +0000
Subject: [PATCH 2/6] Update metadata

---
 contrib/msi/build-msi.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index cf69d6bf..3f80487d 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -100,7 +100,7 @@ cat > wix.xml << EOF
       Id="*"
       Keywords="Installer"
       Description="Yggdrasil Network Installer"
-      Comments="This is the Yggdrasil Network router for Windows."
+      Comments="Yggdrasil Network standalone router for Windows."
       Manufacturer="github.com/yggdrasil-network"
       InstallerVersion="200"
       InstallScope="perMachine"
@@ -115,7 +115,8 @@ cat > wix.xml << EOF
     <Media
       Id="1"
       Cabinet="Media.cab"
-      EmbedCab="yes" />
+      EmbedCab="yes"
+      CompressionLevel="high" />
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="${PKGINSTFOLDER}" Name="PFiles">

From 3e388cd7f9b6adedf768fea512a7c8e3801d2c49 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:27:49 +0000
Subject: [PATCH 3/6] Try to avoid breaking Wintun during upgrades

---
 contrib/msi/build-msi.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index 3f80487d..358fb775 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -185,6 +185,9 @@ cat > wix.xml << EOF
     </Feature>
 
     <Feature Id="WintunFeature" Title="Wintun" Level="1">
+      <Condition Level="0">
+        NOT UPGRADINGPRODUCTCODE
+      </Condition>
       <MergeRef Id="Wintun" />
     </Feature>
 

From 6f927b06133b5a2b5d01cdd8757e5509e45e5403 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:33:52 +0000
Subject: [PATCH 4/6] Reverse upgrade condition

---
 contrib/msi/build-msi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index 358fb775..b6601968 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -186,7 +186,7 @@ cat > wix.xml << EOF
 
     <Feature Id="WintunFeature" Title="Wintun" Level="1">
       <Condition Level="0">
-        NOT UPGRADINGPRODUCTCODE
+        UPGRADINGPRODUCTCODE
       </Condition>
       <MergeRef Id="Wintun" />
     </Feature>

From 4762edc2b3067884c696755d51907c5e467371c0 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:38:58 +0000
Subject: [PATCH 5/6] Package display name

---
 contrib/msi/build-msi.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index b6601968..e291074e 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -83,12 +83,18 @@ else
   exit 1
 fi
 
+if [ $PKGNAME != "master" ]; then
+  PKGDISPLAYNAME="Yggdrasil Network (${PKGNAME} branch)"
+elif
+  PKGDISPLAYNAME="Yggdrasil Network"
+fi
+
 # Generate the wix.xml file
 cat > wix.xml << EOF
 <?xml version="1.0" encoding="windows-1252"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product
-    Name="Yggdrasil (${PKGNAME} branch)"
+    Name="${PKGDISPLAYNAME}"
     Id="*"
     UpgradeCode="${PKGGUID}"
     Language="1033"

From 1a1e32c411e3e8d11749cbb0c4d4c64ee228990a Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:40:16 +0000
Subject: [PATCH 6/6] Fix syntax error in build-msi.sh

---
 contrib/msi/build-msi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index e291074e..421481cd 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -85,7 +85,7 @@ fi
 
 if [ $PKGNAME != "master" ]; then
   PKGDISPLAYNAME="Yggdrasil Network (${PKGNAME} branch)"
-elif
+else
   PKGDISPLAYNAME="Yggdrasil Network"
 fi