Skip to content

Commit

Permalink
installer: avoid extra console window with Git Bash
Browse files Browse the repository at this point in the history
As reported by Valerii Pekarskyi, when selecting the ConHost-based Git
Bash, we had an extra console window. The reason is that we added the
SHOW_CONSOLE=1 configuration to `git-bash.exe` *in addition to* making
`git-bash.exe` a console application (by copying over the `git-cmd.exe`,
overwriting `git-bash.exe`). Let's do only the former and skip the
latter.

This fixes git-for-windows/git#148.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed May 14, 2015
1 parent 608741c commit 82553c9
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions installer/install.iss.in
Original file line number Diff line number Diff line change
Expand Up @@ -1331,13 +1331,7 @@ begin
}

if RdbBashTerminal[GB_ConHost].checked then begin
if FileCopy(AppDir+'\git-cmd.exe',AppDir+'\git-bash.exe',False) then begin
OverrideGitBashCommandLine(AppDir+'\git-bash.exe','SHOW_CONSOLE=1 @@COMSPEC@@ /C "@@EXEPATH@@\usr\bin\bash.exe" --login -i');
end else begin
Msg:='Unable to configure `git-bash.exe`';
SuppressibleMsgBox(Msg,mbError,MB_OK,IDOK);
Log(Msg);
end;
OverrideGitBashCommandLine(AppDir+'\git-bash.exe','SHOW_CONSOLE=1 @@COMSPEC@@ /C "@@EXEPATH@@\usr\bin\bash.exe" --login -i');
end;

{
Expand Down

0 comments on commit 82553c9

Please sign in to comment.