From eb5236f6f24b88ef47f3bb87cfede186eaba4533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Tue, 31 May 2022 16:07:50 +0200
Subject: [PATCH] Include Visual C++ Redistributable in Installer

---
 assets/setup.nsi | 6 ++++++
 mk.py            | 1 +
 2 files changed, 7 insertions(+)

diff --git a/assets/setup.nsi b/assets/setup.nsi
index d0775ba..28d46c3 100644
--- a/assets/setup.nsi
+++ b/assets/setup.nsi
@@ -70,6 +70,12 @@ continue:
 		${EndIf}
 	${EndIf}
 
+	# Install Visual C++ Redistributable (only if not silent)
+	IfSilent +4 0
+	InitPluginsDir
+	File /oname=$PLUGINSDIR\vc_redist.x64.exe vc_redist.x64.exe
+	ExecWait "$PLUGINSDIR\vc_redist.x64.exe /install /quiet /norestart"
+
 	# Copy files
 	SetOutPath $INSTDIR
 	File /r librewolf\*.*
diff --git a/mk.py b/mk.py
index 19567df..1e5574c 100644
--- a/mk.py
+++ b/mk.py
@@ -165,6 +165,7 @@ def artifacts():
             os.chdir('work')
             exec("mkdir x86-ansi")
             exec("wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll")
+            exec("wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe")
             setupname = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version)
             exec('sed \"s/pkg_version/{}/g\" < ../assets/setup.nsi > tmp.nsi'.format(full_version))
             exec('cp -v ../assets/librewolf.ico .')