Skip to content

#1517: configure Git Bash in Windows Terminal during MSI installation #2079

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

Draft
quando632 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

#1517: configure Git Bash in Windows Terminal during MSI installation #2079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a17fd5c
feat: add test and bugfix for IDE_ROOT null
quando632 Jun 26, 2026
c558f83
Merge branch 'main' into feature/msi-for-git-bash
quando632 Jun 26, 2026
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
5 changes: 3 additions & 2 deletions cli/src/main/java/com/devonfw/tools/ide/tool/IdeasyCommandlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -490,13 +491,13 @@ private void configureGitBashProfile(Path settingsPath, String bashPath) throws
ObjectNode gitBashProfile = mapper.createObjectNode();
String newGuid = "{2ece5bfe-50ed-5f3a-ab87-5cd4baafed2b}";
String iconPath = getGitBashIconPath(bashPath);
String startingDirectory = this.context.getIdeRoot().toString();
Path startingDirectory = Objects.requireNonNullElse(this.context.getIdeRoot(), this.context.getUserHome());

gitBashProfile.put("guid", newGuid);
gitBashProfile.put("name", "Git Bash");
gitBashProfile.put("commandline", bashPath);
gitBashProfile.put("icon", iconPath);
gitBashProfile.put("startingDirectory", startingDirectory);
gitBashProfile.put("startingDirectory", startingDirectory.toString());

((ArrayNode) profilesList).add(gitBashProfile);

Expand Down
15 changes: 12 additions & 3 deletions cli/src/test/java/com/devonfw/tools/ide/tool/IdeasyCommandletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,22 @@ void testInstallIdeasy(String os) {
+ addedRcLines);
}

/** Test of {@link IdeasyCommandlet#configureWindowsTerminalGitBash()}. */
@Test
void testConfigureWindowsTerminalGitBash() {
/**
* Test of {@link IdeasyCommandlet#configureWindowsTerminalGitBash()}, also when {@code IDE_ROOT} is not yet set, as is the case during MSI installation.
*
* @param ideRootSet whether {@code IDE_ROOT} is set on the context.
*/
@ParameterizedTest
@ValueSource(booleans = { true, false })
void testConfigureWindowsTerminalGitBash(boolean ideRootSet) {

// arrange
SystemInfo systemInfo = SystemInfoMock.of("windows");
IdeTestContext context = newContext("install");
context.setSystemInfo(systemInfo);
if (!ideRootSet) {
context.setIdeRoot(null);
}
IdeasyCommandlet ideasy = new IdeasyCommandlet(context);

// act
Expand Down
Loading