Support for MSYS2 subsystem/shell, fixes #241

jline · Mar 26, 2018 · 5b2578c · robby-phd · Mar 26, 2018 · gnodet
1 parent adb1d94
commit 5b2578c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -291,7 +291,7 @@ private Terminal doBuild() throws IOException {
                 //
                 // Cygwin support
                 //
-                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MINGW) && exec && !cygwinTerm) {
+                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) && exec && !cygwinTerm) {
                     try {
                         Pty pty = ExecPty.current();
                         // Cygwin defaults to XTERM, but actually supports 256 colors,

diff --git a/terminal/src/main/java/org/jline/utils/OSUtils.java b/terminal/src/main/java/org/jline/utils/OSUtils.java
@@ -18,10 +18,16 @@ public class OSUtils {
             && System.getenv("PWD") != null
             && System.getenv("PWD").startsWith("/");
 
+    @Deprecated
     public static final boolean IS_MINGW = IS_WINDOWS
             && System.getenv("MSYSTEM") != null
             && System.getenv("MSYSTEM").startsWith("MINGW");
 
+    public static final boolean IS_MSYSTEM = IS_WINDOWS
+            && System.getenv("MSYSTEM") != null
+            && (System.getenv("MSYSTEM").startsWith("MINGW")
+                || System.getenv("MSYSTEM").equals("MSYSTEM"));
+
     public static final boolean IS_CONEMU = IS_WINDOWS
             && System.getenv("ConEmuPID") != null;
 
@@ -37,7 +43,7 @@ public class OSUtils {
         String stty;
         String sttyfopt;
         String infocmp;
-        if (OSUtils.IS_CYGWIN || OSUtils.IS_MINGW) {
+        if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
             tty = "tty.exe";
             stty = "stty.exe";
             sttyfopt = null;