From e2e9f965ac3a5161f0b47e8a6298d226c48add0a Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Wed, 19 Sep 2012 11:57:31 -0400 Subject: [PATCH] SHL-60 - Jansi terminal support not working under cygwin --- .../java/org/springframework/shell/core/JLineShell.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/shell/core/JLineShell.java b/src/main/java/org/springframework/shell/core/JLineShell.java index 905189bd..40129d93 100644 --- a/src/main/java/org/springframework/shell/core/JLineShell.java +++ b/src/main/java/org/springframework/shell/core/JLineShell.java @@ -201,7 +201,7 @@ public abstract class JLineShell extends AbstractShell implements CommandMarker, protected ConsoleReader createConsoleReader() { ConsoleReader consoleReader = null; try { - if (JANSI_AVAILABLE && OsUtils.isWindows()) { + if (isJansiAvailable()) { try { consoleReader = createAnsiWindowsReader(); } catch (Exception e) { @@ -218,6 +218,10 @@ public abstract class JLineShell extends AbstractShell implements CommandMarker, return consoleReader; } + private boolean isJansiAvailable() { + return JANSI_AVAILABLE && OsUtils.isWindows() && System.getProperty("jline.terminal") == null; + } + public void printBannerAndWelcome() { }