This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new e100da7 [KARAF-5647] start, stop, shell, status and client fail on
Solaris Sparc 11
e100da7 is described below
commit e100da7f4ed148c82f67426f8a4497c4e33aa6bf
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Feb 28 14:49:55 2018 +0100
[KARAF-5647] start, stop, shell, status and client fail on Solaris Sparc 11
---
.../main/filtered-resources/resources/bin/client | 35 +++++++++++++++-------
.../main/filtered-resources/resources/bin/shell | 35 +++++++++++++++-------
.../main/filtered-resources/resources/bin/start | 35 +++++++++++++++-------
.../main/filtered-resources/resources/bin/status | 35 +++++++++++++++-------
.../src/main/filtered-resources/resources/bin/stop | 35 +++++++++++++++-------
5 files changed, 125 insertions(+), 50 deletions(-)
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 a1bd3ef..7c00e01 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -17,17 +17,32 @@
#
realpath() {
- OURPWD=${PWD}
- cd "$(dirname "${1}")" || exit 2
- LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- while [ "${LINK}" ]; do
- echo "link: ${LINK}" >&2
- cd "$(dirname "${LINK}")" || exit 2
+ READLINK_EXISTS=$(command -v readlink &> /dev/null)
+ if [ -z $READLINK_EXISTS ]; then
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- done
- REALPATH="${PWD}/$(basename "${1}")"
- cd "${OURPWD}" || exit 2
- echo "${REALPATH}"
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ else
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ fi
}
REALNAME=$(realpath "$0")
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 8a5a85a..e16a078 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -17,17 +17,32 @@
#
realpath() {
- OURPWD=${PWD}
- cd "$(dirname "${1}")" || exit 2
- LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- while [ "${LINK}" ]; do
- echo "link: ${LINK}" >&2
- cd "$(dirname "${LINK}")" || exit 2
+ READLINK_EXISTS=$(command -v readlink &> /dev/null)
+ if [ -z $READLINK_EXISTS ]; then
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- done
- REALPATH="${PWD}/$(basename "${1}")"
- cd "${OURPWD}" || exit 2
- echo "${REALPATH}"
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ else
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ fi
}
REALNAME=$(realpath "$0")
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 19fd11b..9f2e4b1 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/start
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/start
@@ -17,17 +17,32 @@
#
realpath() {
- OURPWD=${PWD}
- cd "$(dirname "${1}")" || exit 2
- LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- while [ "${LINK}" ]; do
- echo "link: ${LINK}" >&2
- cd "$(dirname "${LINK}")" || exit 2
+ READLINK_EXISTS=$(command -v readlink &> /dev/null)
+ if [ -z $READLINK_EXISTS ]; then
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- done
- REALPATH="${PWD}/$(basename "${1}")"
- cd "${OURPWD}" || exit 2
- echo "${REALPATH}"
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ else
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ fi
}
REALNAME=$(realpath "$0")
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 778e0ad..c7c245d 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/status
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/status
@@ -17,17 +17,32 @@
#
realpath() {
- OURPWD=${PWD}
- cd "$(dirname "${1}")" || exit 2
- LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- while [ "${LINK}" ]; do
- echo "link: ${LINK}" >&2
- cd "$(dirname "${LINK}")" || exit 2
+ READLINK_EXISTS=$(command -v readlink &> /dev/null)
+ if [ -z $READLINK_EXISTS ]; then
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- done
- REALPATH="${PWD}/$(basename "${1}")"
- cd "${OURPWD}" || exit 2
- echo "${REALPATH}"
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ else
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ fi
}
REALNAME=$(realpath "$0")
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 93a1cc4..db58353 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
@@ -17,17 +17,32 @@
#
realpath() {
- OURPWD=${PWD}
- cd "$(dirname "${1}")" || exit 2
- LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- while [ "${LINK}" ]; do
- echo "link: ${LINK}" >&2
- cd "$(dirname "${LINK}")" || exit 2
+ READLINK_EXISTS=$(command -v readlink &> /dev/null)
+ if [ -z $READLINK_EXISTS ]; then
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
- done
- REALPATH="${PWD}/$(basename "${1}")"
- cd "${OURPWD}" || exit 2
- echo "${REALPATH}"
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(ls -l "$(basename "${1}")" | awk -F"-> " '{print $2}')
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ else
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ echo "link: ${LINK}" >&2
+ cd "$(dirname "${LINK}")" || exit 2
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}" || exit 2
+ echo "${REALPATH}"
+ fi
}
REALNAME=$(realpath "$0")
--
To stop receiving notification emails like this one, please contact
[email protected].
