[09/14] karaf git commit: [KARAF-5304] Update karaf script to be compliant with AIX

[cschneider]

[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/b7bdb359
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b7bdb359
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b7bdb359

Branch: refs/heads/model_features
Commit: b7bdb359499d7fd9db09847e078d20cb461c2ace
Parents: 244fafd
Author: Jean-Baptiste Onofré 
Authored: Fri Aug 11 15:00:57 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Fri Aug 11 15:01:34 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/b7bdb359/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 dc022bc..048b344 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

karaf git commit: [KARAF-5304] Update karaf script to be compliant with AIX

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x cdb905c0a -> e1f74e3a2


[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/e1f74e3a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e1f74e3a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e1f74e3a

Branch: refs/heads/karaf-4.0.x
Commit: e1f74e3a2148a3b9b47cc1066d84ef5413920ce1
Parents: cdb905c
Author: Jean-Baptiste Onofré 
Authored: Fri Aug 11 17:34:02 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Fri Aug 11 17:34:02 2017 +0200

--
 assemblies/features/base/src/main/resources/resources/bin/karaf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/e1f74e3a/assemblies/features/base/src/main/resources/resources/bin/karaf
--
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf 
b/assemblies/features/base/src/main/resources/resources/bin/karaf
index a86956b..c157a7a 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -358,7 +358,7 @@ 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
   ROOT_INSTANCE_RUNNING=true
   fi

karaf git commit: [KARAF-5304] Update karaf script to be compliant with AIX

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/master 244fafdc4 -> b7bdb3594


[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/b7bdb359
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b7bdb359
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b7bdb359

Branch: refs/heads/master
Commit: b7bdb359499d7fd9db09847e078d20cb461c2ace
Parents: 244fafd
Author: Jean-Baptiste Onofré 
Authored: Fri Aug 11 15:00:57 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Fri Aug 11 15:01:34 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/b7bdb359/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 dc022bc..048b344 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

karaf git commit: [KARAF-5304] Update karaf script to be compliant with AIX

[jbonofre]

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é 
Authored: Fri Aug 11 15:00:57 2017 +0200
Committer: Jean-Baptiste Onofré 
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