From 65a1922ed4b024caa3beaf2ea6008d33f4e85e82 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 21 Apr 2021 23:15:24 +1000
Subject: [PATCH] ci: remove vcredist

Microsoft took this link down. It's still up on web.archive.org,
but it might not be necessary anyway since now we compile our own
deps. Going to try without it.
---
 .github/workflows/ci.yml             | 2 +-
 app/packaging/windows/nsis/olive.nsi | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0abba2a9f..4cb8b22ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -234,7 +234,7 @@ jobs:
         shell: bash
         run: |
           # Create Installer Executable
-          $DOWNLOAD_TOOL https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe
+          #$DOWNLOAD_TOOL http://web.archive.org/web/20210226132532/http://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe
           cp $(cygpath $GITHUB_WORKSPACE)/app/packaging/windows/nsis/* .
           cp $(cygpath $GITHUB_WORKSPACE)/LICENSE .
           $DOWNLOAD_TOOL https://nsis.sourceforge.io/mediawiki/images/c/c7/ShellExecAsUser.zip
diff --git a/app/packaging/windows/nsis/olive.nsi b/app/packaging/windows/nsis/olive.nsi
index eb9ea604b..550ecdf4b 100644
--- a/app/packaging/windows/nsis/olive.nsi
+++ b/app/packaging/windows/nsis/olive.nsi
@@ -39,9 +39,9 @@ Section "Olive"
     WriteUninstaller "$INSTDIR\uninstall.exe"
 
     # Install Visual C++ 2010 Redistributable
-    File "vcredist_x64.exe"
-    ExecWait '"$INSTDIR\vcredist_x64.exe" /quiet'
-    Delete "$INSTDIR\vcredist_x64.exe"
+    #File "vcredist_x64.exe"
+    #ExecWait '"$INSTDIR\vcredist_x64.exe" /quiet'
+    #Delete "$INSTDIR\vcredist_x64.exe"
 SectionEnd
 
 Section "Create Desktop shortcut"