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/12 09:06:31 UTC
karaf git commit: Fix the auto color mode for grep by detecting if
the output stream is a tty.
Repository: karaf
Updated Branches:
refs/heads/master 6f2d2bb57 -> de7089d51
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/de7089d5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/de7089d5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/de7089d5
Branch: refs/heads/master
Commit: de7089d5149eb9d011f690e6177cc7ab087372bd
Parents: 6f2d2bb
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Sep 12 11:06:09 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Sep 12 11:06:09 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/commands/impl/GrepAction.java | 2 +-
.../test/java/org/apache/karaf/shell/commands/impl/GrepTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/de7089d5/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 fbdfe89..d15d4e9 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
@@ -106,7 +106,7 @@ public class GrepAction implements Action {
@Override
public Object execute() throws Exception {
- if (color == ColorOption.auto && !Process.current().isTty(1)) {
+ if (color == ColorOption.auto && (Process.current() == null || !Process.current().isTty(1))) {
color = ColorOption.never;
}
if (after < 0) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/de7089d5/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java b/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
index b96d1da..c2bea94 100644
--- a/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
+++ b/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
@@ -43,7 +43,7 @@ public class GrepTest {
GrepAction grep = new GrepAction();
DefaultActionPreparator preparator = new DefaultActionPreparator();
- preparator.prepare(grep, null, Arrays.asList("-C", "100", "2"));
+ preparator.prepare(grep, null, Arrays.asList("--color", "always", "-C", "100", "2"));
final String returnedString = systemInOutDecorator("1\n2\n3\n4\n5\n6\n7\n8\n9\n", grep);
assertEquals(expectedColoredString, returnedString);
}