You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2017/08/17 05:10:53 UTC
karaf git commit: [KARAF-5312]bin/stop script output some unwanted
message on mac
Repository: karaf
Updated Branches:
refs/heads/master b57bceae1 -> 8f94e291d
[KARAF-5312]bin/stop script output some unwanted message on mac
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8f94e291
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8f94e291
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8f94e291
Branch: refs/heads/master
Commit: 8f94e291dc24291e28a1e5eefbdd7ec28ce56ffe
Parents: b57bcea
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Aug 17 13:10:43 2017 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Aug 17 13:10:43 2017 +0800
----------------------------------------------------------------------
.../features/base/src/main/filtered-resources/resources/bin/karaf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8f94e291/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index 048b344..674b8d0 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -92,7 +92,7 @@ checkRootInstance() {
if ps -p "${ROOT_INSTANCE_PID}" > /dev/null
then
MAIN=org.apache.karaf.main.Main
- PID_COMMAND=$(ps -p "${ROOT_INSTANCE_PID}" o args | sed 1d)
+ PID_COMMAND=$(ps -p "${ROOT_INSTANCE_PID}" -o args | sed 1d)
if [ "${PID_COMMAND#*$MAIN}" != "$PID_COMMAND" ]; then
ROOT_INSTANCE_RUNNING=true
fi