AIX issue with non english locales (#881)

Backport of https://bugs.openjdk.java.net/browse/JDK-8261920
jline · Oct 24, 2023 · 77283f8 · 77283f8
1 parent 2c8891a
commit 77283f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/ExecHelper.java b/terminal/src/main/java/org/jline/utils/ExecHelper.java
@@ -14,6 +14,7 @@
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -28,6 +29,12 @@ public static String exec(boolean redirectInput, final String... cmd) throws IOE
         try {
             Log.trace("Running: ", cmd);
             ProcessBuilder pb = new ProcessBuilder(cmd);
+            if (OSUtils.IS_AIX) {
+                Map<String, String> env = pb.environment();
+                env.put("PATH", "/opt/freeware/bin:" + env.get("PATH"));
+                env.put("LANG", "C");
+                env.put("LC_ALL", "C");
+            }
             if (redirectInput) {
                 pb.redirectInput(ProcessBuilder.Redirect.INHERIT);
             }

diff --git a/terminal/src/main/java/org/jline/utils/OSUtils.java b/terminal/src/main/java/org/jline/utils/OSUtils.java
@@ -39,6 +39,8 @@ public class OSUtils {
     public static final boolean IS_OSX =
             System.getProperty("os.name").toLowerCase().contains("mac");
 
+    public static final boolean IS_AIX = System.getProperty("os.name").equals("AIX");
+
     public static String TTY_COMMAND;
     public static String STTY_COMMAND;
     public static String STTY_F_OPTION;