You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2017/04/27 16:06:07 UTC
svn commit: r1792915 - in
/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline:
Activator.java Main.java
Author: gnodet
Date: Thu Apr 27 16:06:07 2017
New Revision: 1792915
URL: http://svn.apache.org/viewvc?rev=1792915&view=rev
Log:
[gogo][jline] Let jline use defaults for better detection
Modified:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java?rev=1792915&r1=1792914&r2=1792915&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java Thu Apr 27 16:06:07 2017
@@ -110,6 +110,7 @@ public class Activator implements Bundle
regs.add(context.registerService(Shell.class.getName(), shell, dict));
Terminal terminal = TerminalBuilder.builder()
+ .name("gogo")
.system(true)
.nativeSignals(true)
.signalHandler(Terminal.SignalHandler.SIG_IGN)
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java?rev=1792915&r1=1792914&r2=1792915&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java Thu Apr 27 16:06:07 2017
@@ -35,15 +35,9 @@ import org.jline.terminal.TerminalBuilde
public class Main {
public static void main(String[] args) throws IOException {
- InputStream sin = System.in;
- PrintStream sout = System.out;
- PrintStream serr = System.err;
-
try (Terminal terminal = TerminalBuilder.builder()
.name("gogo")
- .type(System.getenv("TERM"))
.system(true)
- .streams(sin, sout)
.nativeSignals(true)
.signalHandler(Terminal.SignalHandler.SIG_IGN)
.build()) {
@@ -61,18 +55,6 @@ public class Main {
register(processor, new Procedural(), Procedural.functions);
register(processor, new Posix(processor), Posix.functions);
register(processor, shell, Shell.functions);
- /*
- try {
- register(processor, new Telnet(processor), Telnet.functions);
- } catch (Throwable t) {
- // ignore
- }
- try {
- register(processor, new Ssh(processor), Ssh.functions);
- } catch (Throwable t) {
- // ignore
- }
- */
InputStream in = new FilterInputStream(terminal.input()) {
@Override
public void close() throws IOException {