Skip to content
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.

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

installer: Support Sublime Text 4 and (probably) newer #355

Merged
merged 2 commits into from
Jun 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ This package contains software from a number of other projects including Bash, z
* Comes with [PCRE2 v10.37](https://pcre.org/news.txt).
* The experimental, built-in file system monitor [is now featured as an experimental option in the installer](https://github.com/git-for-windows/build-extra/pull/351).
* Comes with [Git Credential Manager Core v2.0.474.41365](https://github.com/microsoft/git-credential-manager-core/releases/tag/v2.0.474).
* Sublime Text 4 [now gets detected by the installer](https://github.com/git-for-windows/build-extra/pull/355).

### Bug Fixes

Expand Down
10 changes: 7 additions & 3 deletions installer/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -1810,11 +1810,15 @@ begin
EditorAvailable[GE_VisualStudioCodeInsiders]:=RegQueryStringValue(HKEY_CURRENT_USER,'Software\Classes\Applications\Code - Insiders.exe\shell\open\command','',VisualStudioCodeInsidersPath);
VisualStudioCodeInsidersUserInstallation:=True;
end;
SublimeTextPath:=ExpandConstant('{pf}\Sublime Text 3\subl.exe');
SublimeTextPath:=ExpandConstant('{pf}\Sublime Text\subl.exe');
EditorAvailable[GE_SublimeText]:=PathIsValidExecutable(SublimeTextPath);
if (not EditorAvailable[GE_SublimeText]) then begin
EditorAvailable[GE_SublimeText]:=RegQueryStringValue(HKEY_CURRENT_USER,'Software\Classes\Applications\sublime_text.exe\shell\open\command','',SublimeTextPath);
SublimeTextUserInstallation:=True;
SublimeTextPath:=ExpandConstant('{pf}\Sublime Text 3\subl.exe');
EditorAvailable[GE_SublimeText]:=PathIsValidExecutable(SublimeTextPath);
if (not EditorAvailable[GE_SublimeText]) then begin
EditorAvailable[GE_SublimeText]:=RegQueryStringValue(HKEY_CURRENT_USER,'Software\Classes\Applications\sublime_text.exe\shell\open\command','',SublimeTextPath);
SublimeTextUserInstallation:=True;
end;
end;
EditorAvailable[GE_Atom]:=RegQueryStringValue(HKEY_CURRENT_USER,'Software\Classes\Applications\atom.exe\shell\open\command','',AtomPath);
EditorAvailable[GE_CustomEditor]:=True;
Expand Down