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.

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

Fixes “Not a valid executable” error in installer #221

Merged
merged 3 commits into from
Dec 18, 2018
Merged

Fixes “Not a valid executable” error in installer #221

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d91e7f
Fixes the error message when invalid editor is selected
aakriti-jain Dec 7, 2018
774bc08
Merge branch 'master' of https://github.com/git-for-windows/build-ext…
aakriti-jain Dec 10, 2018
30b895e
Makes installer searche for executibles in PATH too
aakriti-jain Dec 12, 2018
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
33 changes: 19 additions & 14 deletions installer/install.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,21 +1215,26 @@ begin
*)

Path:=EditorPage.Values[0]+' ';
if not WildcardMatch(Lowercase(Path), '"*.exe" *') then
PathLength:=Pos('.exe ',Lowercase(Path))+3
else begin
PathLength:=Pos('.exe" ',Lowercase(Path))+2;
Path:=Copy(Path,2,PathLength)+Copy(Path,PathLength+3,Length(Path))
end;
if Pos('.exe',Lowercase(Path))=0 then begin
CustomEditorPath:=EditorPage.Values[0];
CustomEditorOptions:='';

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

end else begin
if not WildcardMatch(Lowercase(Path), '"*.exe" *') then
PathLength:=Pos('.exe ',Lowercase(Path))+3
else begin
PathLength:=Pos('.exe" ',Lowercase(Path))+2;
Path:=Copy(Path,2,PathLength)+Copy(Path,PathLength+3,Length(Path))
end;

(*
* If the specified path does not contain '.exe' at the end,
* CustomEditorPath will be formed with the first three letters of Path,
* but that should not be a problem because the next button is enabled
* only when PathIsValidExecutable() returns True.
*)
CustomEditorPath:=Copy(Path,1,PathLength);
CustomEditorOptions:=Copy(Path,PathLength+2,Length(Path)-PathLength-2);
(*
* If the specified path does not contain '.exe' at the end,
* CustomEditorPath will be formed with the first three letters of Path,
* but that should not be a problem because the next button is enabled
* only when PathIsValidExecutable() returns True.
*)
CustomEditorPath:=Copy(Path,1,PathLength);
CustomEditorOptions:=Copy(Path,PathLength+2,Length(Path)-PathLength-2);
end;
EnableNextButtonOnValidExecutablePath(CustomEditorPath);
end;

Expand Down