You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/01/28 14:07:23 UTC
karaf git commit: [KARAF-4949] Detect if readlink is available on the
system and use it or fallback to ls and awk
Repository: karaf
Updated Branches:
refs/heads/master d603e42e9 -> f47a22434
[KARAF-4949] Detect if readlink is available on the system and use it or fallback to ls and awk
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f47a2243
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f47a2243
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f47a2243
Branch: refs/heads/master
Commit: f47a2243462ff434abf5e59bd7738fb0b54a06ec
Parents: d603e42
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sat Jan 28 15:06:39 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sat Jan 28 15:06:39 2017 +0100
----------------------------------------------------------------------
.../filtered-resources/resources/bin/instance | 35 ++++++++++++++------
.../main/filtered-resources/resources/bin/karaf | 35 ++++++++++++++------
2 files changed, 50 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f47a2243/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
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 f2c1d83..9a38842 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -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")
http://git-wip-us.apache.org/repos/asf/karaf/blob/f47a2243/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 7e3da84..cd60228 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -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")