Force to use FreeBSD stty on Mac (#706)

jline · Oct 14, 2021 · 5eaf519 · 5eaf519
1 parent 397e728
commit 5eaf519
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java b/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java
@@ -97,19 +97,7 @@ protected void doSetAttr(Attributes attr) throws IOException {
                 commands.add(1, OSUtils.STTY_F_OPTION);
                 commands.add(2, getName());
             }
-            try {
-                exec(system, commands.toArray(new String[commands.size()]));
-            } catch (IOException e) {
-                // Handle partial failures with GNU stty, see #97
-                if (e.toString().contains("unable to perform all requested operations")) {
-                    commands = getFlagsToSet(attr, getAttr());
-                    if (!commands.isEmpty()) {
-                        throw new IOException("Could not set the following flags: " + String.join(", ", commands), e);
-                    }
-                } else {
-                    throw e;
-                }
-            }
+            exec(system, commands.toArray(new String[commands.size()]));
         }
     }
 

diff --git a/terminal/src/main/java/org/jline/utils/OSUtils.java b/terminal/src/main/java/org/jline/utils/OSUtils.java
@@ -66,13 +66,12 @@ public class OSUtils {
         } else {
             tty = "tty";
             stty = "stty";
+            sttyfopt = "-F";
             infocmp = "infocmp";
             if (IS_OSX) {
+                stty = "/bin/stty";
                 sttyfopt = "-f";
             }
-            else {
-                sttyfopt = "-F";
-            }
         }
         TTY_COMMAND = tty;
         STTY_COMMAND = stty;