From 9616dd7d4346f1192a7de392bb489b5e347e484f Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Tue, 29 May 2018 14:15:01 +0300 Subject: [PATCH] update pty4j library to v0.7.5 https://github.com/traff/pty4j/pull/43 --- .idea/libraries/pty4j.xml | 4 ++-- lib/{pty4j-0.7.4.jar => pty4j-0.7.5.jar} | Bin 63053 -> 64465 bytes ...ty4j-0.7.4-src.jar => pty4j-0.7.5-src.jar} | Bin 40993 -> 41747 bytes .../build/CommunityLibraryLicenses.groovy | 2 +- .../configurations/PtyCommandLine.java | 17 ++++++++++------- 5 files changed, 13 insertions(+), 10 deletions(-) rename lib/{pty4j-0.7.4.jar => pty4j-0.7.5.jar} (85%) rename lib/src/{pty4j-0.7.4-src.jar => pty4j-0.7.5-src.jar} (90%) diff --git a/.idea/libraries/pty4j.xml b/.idea/libraries/pty4j.xml index d3e314e2ecb3..f542b0d6c659 100644 --- a/.idea/libraries/pty4j.xml +++ b/.idea/libraries/pty4j.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/lib/pty4j-0.7.4.jar b/lib/pty4j-0.7.5.jar similarity index 85% rename from lib/pty4j-0.7.4.jar rename to lib/pty4j-0.7.5.jar index 8b16c4aafb976965b2a717f304f06c01f9dba1e2..f709f25daf16ad13864a3f2000715cb712fcd845 100644 GIT binary patch delta 4563 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 delta 3268 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 env = new HashMap<>(); setupEnvironment(env); - if (isRedirectErrorStream()) { - LOG.error("Launching process with PTY and redirected error stream is unsupported yet"); - } - String[] command = ArrayUtil.toStringArray(commands); File workDirectory = getWorkDirectory(); String directory = workDirectory != null ? workDirectory.getPath() : null; boolean cygwin = myUseCygwinLaunch && SystemInfo.isWindows; - return PtyProcess.exec(command, env, directory, console, cygwin, getPtyLogFile()); + PtyProcessBuilder builder = new PtyProcessBuilder(command) + .setEnvironment(env) + .setDirectory(directory) + .setConsole(console) + .setCygwin(cygwin) + .setLogFile(getPtyLogFile()) + .setRedirectErrorStream(isRedirectErrorStream()); + return builder.start(); } -} \ No newline at end of file +}