MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Take default shell from env variable.

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-11-26 18:12:23 +01:00
parent 032b1f20c4
commit c5d4fdb0b8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.java
+6 -3
View File
@@ -18,10 +18,7 @@ package org.jetbrains.plugins.terminal;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.jediterm.terminal.emulator.ColorPalette;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -90,6 +87,12 @@ public class TerminalOptionsProvider implements PersistentStateComponent<Termina
}
private static String getDefaultShellPath() {
String shell = System.getenv("SHELL");
if (shell != null && new File(shell).canExecute()) {
return shell;
}
if (SystemInfo.isUnix) {
return "/bin/bash";
}