Repository: karaf Updated Branches: refs/heads/karaf-4.1.x 31e38f8f6 -> 7281969cf
[KARAF-5304] Update karaf script to be compliant with AIX Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7281969c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7281969c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7281969c Branch: refs/heads/karaf-4.1.x Commit: 7281969cff49399c8f4817456e56de3b06b5b7e0 Parents: 31e38f8 Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Fri Aug 11 15:00:57 2017 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Fri Aug 11 15:02:00 2017 +0200 ---------------------------------------------------------------------- .../base/src/main/filtered-resources/resources/bin/karaf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/7281969c/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 0eb9df0..0a191c7 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf @@ -89,10 +89,10 @@ checkRootInstance() { ROOT_INSTANCE_PID=$(sed -n -e '/item.0.pid/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties") ROOT_INSTANCE_NAME=$(sed -n -e '/item.0.name/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties") if [ "${ROOT_INSTANCE_PID}" -ne "0" ]; then - if ps p "${ROOT_INSTANCE_PID}" > /dev/null + 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
