[
https://issues.apache.org/jira/browse/KARAF-5753?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16488841#comment-16488841
]
ASF GitHub Bot commented on KARAF-5753:
---------------------------------------
gnodet closed pull request #504: [KARAF-5753]
URL: https://github.com/apache/karaf/pull/504
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
index 7c00e01086..c4d1d429be 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index 58c3ce3693..7e90d480a5 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -32,6 +32,7 @@ detectOS() {
darwin=false;
aix=false;
os400=false;
+ hpux=false;
case "$(uname)" in
CYGWIN*)
cygwin=true
@@ -44,16 +45,20 @@ detectOS() {
;;
AIX*)
aix=true
+ # For AIX, set an environment variable
+ export LDR_CNTRL=MAXDATA=0xB0000000@DSA
+ echo ${LDR_CNTRL}
;;
OS400*)
os400=true
;;
+ HP-UX*)
+ hpux=true
+ # For HP-UX, set an environment variable
+ export PS_PREFIX="UNIX95= "
+ echo "${PS_PREFIX}"
+ ;;
esac
- # For AIX, set an environment variable
- if ${aix}; then
- export LDR_CNTRL=MAXDATA=0xB0000000@DSA
- echo ${LDR_CNTRL}
- fi
}
unlimitFD() {
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
index 9a388427cd..89e9ef3323 100755
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
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 36c0ca6089..1bb9e2e3af 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "$READLINK_EXISTS" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
@@ -93,7 +93,8 @@ 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_PREFIX}"ps -p "${ROOT_INSTANCE_PID}" -o args
| sed 1d)
+
if [ "${PID_COMMAND#*$MAIN}" != "$PID_COMMAND" ]; then
ROOT_INSTANCE_RUNNING=true
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
index e16a078175..f5d473a725 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/start
b/assemblies/features/base/src/main/filtered-resources/resources/bin/start
index 9f2e4b1092..b1b384481c 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/start
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/start
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/status
b/assemblies/features/base/src/main/filtered-resources/resources/bin/status
index c7c245d564..53e10a7268 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/status
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/status
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
index db5835385f..60b498df49 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
@@ -18,7 +18,7 @@
realpath() {
READLINK_EXISTS=$(command -v readlink &> /dev/null)
- if [ -z $READLINK_EXISTS ]; then
+ if [ -z "${READLINK_EXISTS}" ]; then
OURPWD=${PWD}
cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Karaf won't start correctly on HP-UX
> ------------------------------------
>
> Key: KARAF-5753
> URL: https://issues.apache.org/jira/browse/KARAF-5753
> Project: Karaf
> Issue Type: Bug
> Components: karaf-shell
> Affects Versions: 4.2.0
> Environment: HP-UX 11.31
> Reporter: stephane Ricci
> Assignee: Jean-Baptiste Onofré
> Priority: Major
>
> On HP system, default ps command does not support -o option
> {code:java}
> $ ps -p 21601 -o args
> ps: illegal option -- o
> usage: ps [-edaxzflP] [-u ulist] [-g glist] [-p plist] [-t tlist] [-R
> prmgroup] [-Z psetidlist]
> $ UNIX95= ps -p 21601 -o args
> COMMAND
> /usr/sbin/stm/uut/bin/tools/monitor/dm_fclp_adapter
> {code}
> This command line :
> {code:java}
> PID_COMMAND=$(ps -p "${ROOT_INSTANCE_PID}" -o args | sed 1d)
> {code}
> should be replaced by :
>
> {code:java}
> DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]`
> case "$DIST_OS" in
> 'hp-ux')PID_COMMAND=$(UNIX95= ps -p "${ROOT_INSTANCE_PID}" -o
> args | sed 1d);;
> *)PID_COMMAND=$(ps -p "${ROOT_INSTANCE_PID}" -o args | sed
> 1d);;
> esac{code}
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
