Restore compatibility with jansi 1.12

jline · Apr 27, 2017 · 16055f7 · 16055f7
1 parent 5ed8881
commit 16055f7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/jline/pom.xml b/jline/pom.xml
@@ -251,6 +251,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*;-noimport:=true</Export-Package>
+                        <Import-Package>
+                            com.sun.jna*,
+                            org.apache.sshd*,
+                            org.fusesource.jansi;version="[1.12,2)",
+                            org.fusesource.jansi.internal;version="[1.6,2)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
        </plugins>
     </build>
 

diff --git a/terminal-jansi/pom.xml b/terminal-jansi/pom.xml
@@ -48,6 +48,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package>*;-noimport:=true</Export-Package>
+                        <Import-Package>
+                            org.fusesource.jansi;version="[1.12,2)",
+                            org.fusesource.jansi.internal;version="[1.6,2)"
+                        </Import-Package>
                         <Fragment-Host>org.jline.terminal</Fragment-Host>
                     </instructions>
                 </configuration>

diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java
@@ -43,7 +43,16 @@ public JansiNativePty(int master, FileDescriptor masterFD, int slave, FileDescri
     }
 
     protected static String ttyname() throws IOException {
-        String name = CLibrary.ttyname(0);
+        String name;
+        if (JANSI_MAJOR_VERSION > 1 || JANSI_MAJOR_VERSION == 1 && JANSI_MINOR_VERSION >= 16) {
+            name = CLibrary.ttyname(0);
+        } else {
+            try {
+                name = exec(true, OSUtils.TTY_COMMAND);
+            } catch (IOException e) {
+                throw new IOException("Not a tty", e);
+            }
+        }
         if (name != null) {
             name = name.trim();
         }

diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java
@@ -52,7 +52,7 @@ public Pty current() throws IOException {
             }
         }
         else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
-            if (JANSI_MAJOR_VERSION > 0) {
+            if (JANSI_MAJOR_VERSION > 1 || JANSI_MAJOR_VERSION == 1 && JANSI_MINOR_VERSION >= 12) {
                 return OsXNativePty.current();
             }
         }
@@ -70,7 +70,10 @@ else if (osName.startsWith("FreeBSD")) {
 
     @Override
     public Terminal winSysTerminal(String name, boolean nativeSignals, Terminal.SignalHandler signalHandler) throws IOException {
-        return new JansiWinSysTerminal(name, nativeSignals, signalHandler);
+        if (JANSI_MAJOR_VERSION > 1 || JANSI_MAJOR_VERSION == 1 && JANSI_MINOR_VERSION >= 12) {
+            return new JansiWinSysTerminal(name, nativeSignals, signalHandler);
+        }
+        throw new UnsupportedOperationException();
     }
 
 }