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 2017/09/11 21:28:51 UTC
[5/6] karaf git commit: Merge branch 'KARAF-5361', fixes #355
Merge branch 'KARAF-5361', fixes #355
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bf8d2206
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bf8d2206
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bf8d2206
Branch: refs/heads/master
Commit: bf8d2206add332086710b7901175181272616d4c
Parents: 78d2825 24ca7ee
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Sep 11 23:27:41 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Sep 11 23:27:41 2017 +0200
----------------------------------------------------------------------
.../karaf/shell/commands/impl/WatchAction.java | 87 +++++++++++---------
.../shell/impl/console/ConsoleSessionImpl.java | 1 +
.../shell/impl/console/HeadlessSessionImpl.java | 1 +
.../shell/impl/console/SessionFactoryImpl.java | 2 +-
4 files changed, 50 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bf8d2206/shell/core/src/main/java/org/apache/karaf/shell/impl/console/SessionFactoryImpl.java
----------------------------------------------------------------------
diff --cc shell/core/src/main/java/org/apache/karaf/shell/impl/console/SessionFactoryImpl.java
index e6c5a20,1640d86..d351753
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/SessionFactoryImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/SessionFactoryImpl.java
@@@ -72,7 -72,7 +72,7 @@@ public class SessionFactoryImpl extend
}
Posix posix = new Posix(commandProcessor);
- for (String name : new String[]{"cat", "echo", "grep", "sort", "sleep", "cd", "pwd", "ls", "less", "watch", "nano", "head", "tail", "clear", "wc", "date", "tmux", "ttop"}) {
- for (String name : new String[]{"cat", "echo", "grep", "sort", "sleep", "cd", "pwd", "ls", "less", "nano", "head", "tail", "clear", "wc", "date"}) {
++ for (String name : new String[]{"cat", "echo", "grep", "sort", "sleep", "cd", "pwd", "ls", "less", "nano", "head", "tail", "clear", "wc", "date", "tmux", "ttop"}) {
register(new ShellCommand(name, null, posix, name));
}
}