Skip to content

Bundle Visual C++ Redistributable in Windows NSIS installer #11060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JosephMcEvoy wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −0
Open

Bundle Visual C++ Redistributable in Windows NSIS installer #11060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,15 @@ jobs:
npm install --global node-gyp@10.2.0
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}

- name: Download Visual C++ Redistributable
shell: bash
run: |
if [ "$ARCH" = "arm64" ]; then
curl -sSL -o build/vc_redist.exe "https://aka.ms/vs/17/release/vc_redist.arm64.exe"
else
curl -sSL -o build/vc_redist.exe "https://aka.ms/vs/17/release/vc_redist.x64.exe"
fi
ls -la build/vc_redist.exe
- name: Build
shell: powershell
run: |
Expand Down
12 changes: 12 additions & 0 deletions build/installer.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
!macro customInit
nsExec::Exec '"$LOCALAPPDATA\tabby\Update.exe" --uninstall -s'
!macroend

!macro customInstall
; Install Visual C++ Redistributable if vcruntime140.dll is missing.
; Native modules (node-pty) require it; without it Tabby shows the
; splash screen but the terminal never loads. See #10734, #10782.
IfFileExists "$SYSDIR\vcruntime140.dll" vcredist_installed
DetailPrint "Installing Visual C++ Redistributable..."
File /oname=$PLUGINSDIR\vc_redist.exe "${BUILD_RESOURCES_DIR}\vc_redist.exe"
ExecWait '"$PLUGINSDIR\vc_redist.exe" /install /quiet /norestart' $1
DetailPrint "Visual C++ Redistributable exit code: $1"
vcredist_installed:
!macroend
Loading