You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/09/08 10:05:14 UTC
[2/2] karaf git commit: Fix the auto color mode for grep by detecting
if the output stream is a tty.
Fix the auto color mode for grep by detecting if the output stream is a tty.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6f2d2bb5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6f2d2bb5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6f2d2bb5
Branch: refs/heads/master
Commit: 6f2d2bb572acb92831e3cfc3756d7d70cbb28067
Parents: 2969a34
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 8 12:05:00 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 8 12:05:00 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/commands/impl/GrepAction.java | 4 ++++
shell/core/pom.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6f2d2bb5/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
index 754a8b1..fbdfe89 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
@@ -18,6 +18,7 @@
*/
package org.apache.karaf.shell.commands.impl;
+import org.apache.felix.gogo.api.Process;
import org.apache.karaf.shell.api.action.Action;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
@@ -105,6 +106,9 @@ public class GrepAction implements Action {
@Override
public Object execute() throws Exception {
+ if (color == ColorOption.auto && !Process.current().isTty(1)) {
+ color = ColorOption.never;
+ }
if (after < 0) {
after = context;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/6f2d2bb5/shell/core/pom.xml
----------------------------------------------------------------------
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index f113baa..5e5f5a2 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -143,6 +143,7 @@
<Export-Package>
org.apache.karaf.shell.api.*;version=${project.version},
org.apache.karaf.shell.support.*;version=${project.version},
+ org.apache.felix.gogo.api
</Export-Package>
<Private-Package>
org.apache.karaf.service.guard.tools,
@@ -153,7 +154,6 @@
org.apache.felix.utils.properties,
org.apache.felix.utils.extender,
org.apache.felix.utils.manifest,
- org.apache.felix.gogo.api,
org.apache.felix.gogo.jline,
org.apache.felix.gogo.runtime,
org.apache.felix.gogo.runtime.threadio,