From 272670b85b3efa81f9f04ee20c1435f6be03d96c Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Sun, 13 Jun 2021 11:03:01 +0100
Subject: [PATCH] Fix version numbers in MSI

---
 contrib/msi/build-msi.sh | 1 -
 contrib/msi/msversion.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index 7818e7a..8d40b2b 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -106,7 +106,6 @@ cat > wix.xml << EOF
     Language="1033"
     Codepage="1252"
     Version="${PKGVERSIONMS}"
-    Platform="${PKGARCH}"
     Manufacturer="github.com/yggdrasil-network">
 
     <Package
diff --git a/contrib/msi/msversion.sh b/contrib/msi/msversion.sh
index 95c2ba3..61f221d 100644
--- a/contrib/msi/msversion.sh
+++ b/contrib/msi/msversion.sh
@@ -20,7 +20,7 @@ fi
 # Split out into major, minor and patch numbers
 MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1)
 MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2)
-PATCH=$(echo $TAG | cut -c 2- | cut -d "." -f 3)
+PATCH=$(echo $TAG | cut -c 2- | cut -d "." -f 3 | awk -F"rc" '{print $1}')
 
 # Output in the desired format
 if [ $((PATCH)) -eq 0 ]; then