Support for mingw, fixes #50

jline · Dec 2, 2016 · 85e44ed · 85e44ed
1 parent bc29571
commit 85e44ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/demo/jline-gogo.sh b/demo/jline-gogo.sh
@@ -88,10 +88,14 @@ while [ "${1}" != "" ]; do
 done
 
 cygwin=false
+mingw=false
 case "$(uname)" in
     CYGWIN*)
         cygwin=true
         ;;
+    MINGW*)
+        mingw=true
+        ;;
 esac
 if ${cygwin}; then
   cp=$(cygpath --path --windows "${cp}")
@@ -102,3 +106,4 @@ echo "Classpath: $cp"
 echo "Launching Gogo JLine..."
 set mouse=a
 java -cp $cp $opts org.apache.felix.gogo.jline.Main
+
diff --git a/src/main/java/org/jline/terminal/TerminalBuilder.java b/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -178,7 +178,7 @@ private Terminal doBuild() throws IOException {
             //
             // Cygwin support
             //
-            if (OSUtils.IS_CYGWIN) {
+            if (OSUtils.IS_CYGWIN || OSUtils.IS_MINGW) {
                 try {
                     Pty pty = ExecPty.current();
                     return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler);

diff --git a/src/main/java/org/jline/utils/OSUtils.java b/src/main/java/org/jline/utils/OSUtils.java
@@ -19,6 +19,10 @@ public class OSUtils {
             && System.getenv("PWD").startsWith("/")
             && !"cygwin".equals(System.getenv("TERM"));
 
+    public static final boolean IS_MINGW = IS_WINDOWS
+            && System.getenv("MSYSTEM") != null
+            && System.getenv("MSYSTEM").startsWith("MINGW");
+
     public static final boolean IS_OSX = System.getProperty("os.name").toLowerCase().contains("mac");
 
     public static String TTY_COMMAND;
@@ -31,7 +35,7 @@ public class OSUtils {
         String stty;
         String sttyfopt;
         String infocmp;
-        if (OSUtils.IS_CYGWIN) {
+        if (OSUtils.IS_CYGWIN || OSUtils.IS_MINGW) {
             tty = "tty.exe";
             stty = "stty.exe";
             sttyfopt = null;