Skip to content

allow specifying default local terminal shell on Windows systems #2932

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
danthe1st wants to merge 2 commits into
base: master
Choose a base branch
from
Open

allow specifying default local terminal shell on Windows systems #2932

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
211fb28
allow specifying default local terminal shell on Windows systems
danthe1st Sep 14, 2026
14df6bd
Version bump(s) for 4.42 stream
eclipse-platform-bot Sep 15, 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
2 changes: 1 addition & 1 deletion terminal/bundles/org.eclipse.terminal.connector.local/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.terminal.connector.local;singleton:=true
Bundle-Version: 1.1.200.qualifier
Bundle-Version: 1.1.300.qualifier
Bundle-Activator: org.eclipse.terminal.connector.local.activator.UIPlugin
Bundle-Vendor: %providerName
Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
Expand Down
31 changes: 16 additions & 15 deletions ...nector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,22 +270,23 @@ public <T> T getAdapter(Class<T> adapter) {
* @return The default shell to launch.
*/
private final File defaultShell() {
String shell = null;
String shell = IPreferenceKeys.getPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
String defaultShellEnvironmentVariable;
String defaultShellIfNotSet;
if (Platform.OS_WIN32.equals(Platform.getOS())) {
if (System.getenv("ComSpec") != null && !"".equals(System.getenv("ComSpec").trim())) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
shell = System.getenv("ComSpec").trim(); //$NON-NLS-1$
} else {
shell = "cmd.exe"; //$NON-NLS-1$
}
defaultShellEnvironmentVariable = "ComSpec"; //$NON-NLS-1$
defaultShellIfNotSet = "cmd.exe"; //$NON-NLS-1$
} else {
defaultShellEnvironmentVariable = "SHELL"; //$NON-NLS-1$
defaultShellIfNotSet = "/bin/sh"; //$NON-NLS-1$
}
if (shell == null) {
shell = IPreferenceKeys.getPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
if (shell == null || "".equals(shell)) { //$NON-NLS-1$
if (System.getenv("SHELL") != null && !"".equals(System.getenv("SHELL").trim())) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
shell = System.getenv("SHELL").trim(); //$NON-NLS-1$
} else {
shell = "/bin/sh"; //$NON-NLS-1$
}
if (shell == null || shell.isEmpty()) {
if (System.getenv(defaultShellEnvironmentVariable) != null
&& !"".equals(System.getenv(defaultShellEnvironmentVariable).trim())) { //$NON-NLS-1$
shell = System.getenv(defaultShellEnvironmentVariable).trim();
} else {
shell = defaultShellIfNotSet;
}
}

Expand Down Expand Up @@ -313,7 +314,7 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
}

String arguments = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
if (arguments == null && !Platform.OS_WIN32.equals(Platform.getOS())) {
if (arguments == null) {
arguments = IPreferenceKeys.getPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
}
Expand Down
2 changes: 1 addition & 1 deletion ...rg.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,5 @@ PreferencePage_command_label=Shell Command
PreferencePage_command_button_browse=&Browse...
PreferencePage_command_invalid=Selected shell command is not a file or is not readable or executable.
PreferencePage_command_note_label=Note:
PreferencePage_command_note_text=Leave the shell command empty to fallback to the SHELL environment variable or if not set, to /bin/sh.
PreferencePage_command_note_text=Leave the shell command empty to fallback to the {0} environment variable or if not set, to {1}.
PreferencePage_command_arguments_label=Arguments:
211 changes: 112 additions & 99 deletions ...erminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/PreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
Expand Down Expand Up @@ -118,91 +119,7 @@ protected Control createContents(final Composite parent) {
label.setText(Messages.PreferencePage_label);
label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

if (!Platform.OS_WIN32.equals(Platform.getOS())) {
Group group = new Group(panel, SWT.NONE);
group.setText(Messages.PreferencePage_command_label);
group.setLayout(new GridLayout(2, false));
group.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

command = new Text(group, SWT.SINGLE | SWT.BORDER);
command.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
command.addModifyListener(e -> {
boolean valid = true;
String message = null;

String text = command.getText();
if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$
IPath p = new Path(text.trim());
valid = p.toFile().isFile() && p.toFile().canRead() && p.toFile().canExecute();
if (!valid) {
message = Messages.PreferencePage_command_invalid;
}
}

setValid(valid);
setErrorMessage(message);
});

commandBrowseButton = new Button(group, SWT.PUSH);
commandBrowseButton.setText(Messages.PreferencePage_command_button_browse);
layoutData = new GridData(SWT.FILL, SWT.CENTER, false, false);
layoutData.widthHint = Dialog.convertWidthInCharsToPixels(gc.getFontMetrics(), 14);
commandBrowseButton.setLayoutData(layoutData);
commandBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(parent.getShell(), SWT.OPEN);

String text = command.getText();
if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$
IPath p = new Path(text);

if (p.toFile().isFile() || !p.toFile().exists()) {
dialog.setFilterPath(p.removeLastSegments(1).toOSString());
dialog.setFileName(p.lastSegment());
} else if (p.toFile().isDirectory()) {
dialog.setFilterPath(p.toOSString());
}
}

String selected = dialog.open();
if (selected != null) {
IPath sp = new Path(selected);
command.setText(sp.toOSString());
}
}
});

String cmd = UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
if (cmd != null && !"".equals(cmd)) { //$NON-NLS-1$
command.setText(new Path(cmd).toOSString());
}

Composite argsPanel = new Composite(group, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
layout.marginHeight = 0;
layout.marginWidth = 0;
argsPanel.setLayout(layout);
layoutData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
layoutData.horizontalSpan = 2;
argsPanel.setLayoutData(layoutData);

label = new Label(argsPanel, SWT.NONE);
label.setText(Messages.PreferencePage_command_arguments_label);

arguments = new Text(argsPanel, SWT.SINGLE | SWT.BORDER);
arguments.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

String args = UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
if (args != null && !"".equals(args)) { //$NON-NLS-1$
arguments.setText(args);
}

NoteCompositeHelper.createNoteComposite(group.getFont(), group, Messages.PreferencePage_command_note_label,
Messages.PreferencePage_command_note_text);
}
addShellCommandSection(parent, gc, panel);

Group group = new Group(panel, SWT.NONE);
group.setText(Messages.PreferencePage_workingDir_label);
Expand Down Expand Up @@ -591,6 +508,104 @@ public void addListener(ILabelProviderListener listener) {
return panel;
}

private void addShellCommandSection(final Composite parent, final GC gc, Composite panel) {
GridData layoutData;
Label label;
Group group = new Group(panel, SWT.NONE);
group.setText(Messages.PreferencePage_command_label);
group.setLayout(new GridLayout(2, false));
group.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

command = new Text(group, SWT.SINGLE | SWT.BORDER);
command.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
command.addModifyListener(e -> {
boolean valid = true;
String message = null;

String text = command.getText();
if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$
IPath p = new Path(text.trim());
valid = p.toFile().isFile() && p.toFile().canRead() && p.toFile().canExecute();
if (!valid) {
message = Messages.PreferencePage_command_invalid;
}
}

setValid(valid);
setErrorMessage(message);
});

commandBrowseButton = new Button(group, SWT.PUSH);
commandBrowseButton.setText(Messages.PreferencePage_command_button_browse);
layoutData = new GridData(SWT.FILL, SWT.CENTER, false, false);
layoutData.widthHint = Dialog.convertWidthInCharsToPixels(gc.getFontMetrics(), 14);
commandBrowseButton.setLayoutData(layoutData);
commandBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(parent.getShell(), SWT.OPEN);

String text = command.getText();
if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$
IPath p = new Path(text);

if (p.toFile().isFile() || !p.toFile().exists()) {
dialog.setFilterPath(p.removeLastSegments(1).toOSString());
dialog.setFileName(p.lastSegment());
} else if (p.toFile().isDirectory()) {
dialog.setFilterPath(p.toOSString());
}
}

String selected = dialog.open();
if (selected != null) {
IPath sp = new Path(selected);
command.setText(sp.toOSString());
}
}
});

String cmd = UIPlugin.getScopedPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
if (cmd != null && !"".equals(cmd)) { //$NON-NLS-1$
command.setText(new Path(cmd).toOSString());
}

Composite argsPanel = new Composite(group, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
layout.marginHeight = 0;
layout.marginWidth = 0;
argsPanel.setLayout(layout);
layoutData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
layoutData.horizontalSpan = 2;
argsPanel.setLayoutData(layoutData);

label = new Label(argsPanel, SWT.NONE);
label.setText(Messages.PreferencePage_command_arguments_label);

arguments = new Text(argsPanel, SWT.SINGLE | SWT.BORDER);
arguments.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

String args = UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
if (args != null && !"".equals(args)) { //$NON-NLS-1$
arguments.setText(args);
}

String defaultShellEnvironmentVariable;
String defaultShellIfNotSet;
if (Platform.OS_WIN32.equals(Platform.getOS())) {
defaultShellEnvironmentVariable = "ComSpec"; //$NON-NLS-1$
defaultShellIfNotSet = "cmd.exe"; //$NON-NLS-1$
} else {
defaultShellEnvironmentVariable = "SHELL"; //$NON-NLS-1$
defaultShellIfNotSet = "/bin/sh"; //$NON-NLS-1$
}

NoteCompositeHelper.createNoteComposite(group.getFont(), group, Messages.PreferencePage_command_note_label,
NLS.bind(Messages.PreferencePage_command_note_text, defaultShellEnvironmentVariable,
defaultShellIfNotSet));
}

/**
* Updates the button states.
*/
Expand All @@ -614,10 +629,8 @@ protected void updateButtons() {

@Override
protected void performDefaults() {
if (!Platform.OS_WIN32.equals(Platform.getOS())) {
command.setText(""); //$NON-NLS-1$
arguments.setText(""); //$NON-NLS-1$
}
command.setText(""); //$NON-NLS-1$
arguments.setText(""); //$NON-NLS-1$

String initialCwd = UIPlugin.getScopedPreferences()
.getDefaultString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD);
Expand Down Expand Up @@ -646,16 +659,16 @@ protected void performDefaults() {

@Override
public boolean performOk() {
if (!Platform.OS_WIN32.equals(Platform.getOS())) {
String text = command.getText();
IPath p = new Path(text.trim());
UIPlugin.getScopedPreferences().setValue(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX,
p.toFile().isFile() && p.toFile().canRead() && p.toFile().canExecute() ? p.toOSString() : ""); //$NON-NLS-1$

text = arguments.getText();
UIPlugin.getScopedPreferences().setValue(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS,
!"".equals(text.trim()) ? text.trim() : ""); //$NON-NLS-1$ //$NON-NLS-2$
}
String commandText = command.getText();
IPath commandPath = new Path(commandText.trim());
UIPlugin.getScopedPreferences().setValue(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX,
commandPath.toFile().isFile() && commandPath.toFile().canRead() && commandPath.toFile().canExecute()
? commandPath.toOSString()
: ""); //$NON-NLS-1$

commandText = arguments.getText();
UIPlugin.getScopedPreferences().setValue(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS,
!"".equals(commandText.trim()) ? commandText.trim() : ""); //$NON-NLS-1$ //$NON-NLS-2$

String text = workingDir.getText();
if (text == null || Messages.PreferencePage_workingDir_userhome_label.equals(text) || "".equals(text.trim())) { //$NON-NLS-1$
Expand Down
Loading