You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/03/02 08:18:25 UTC
karaf git commit: KARAF-4371 : karaf shell scripts use "local" which
is not a posix compliant
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x 3dde697b2 -> 799e50c54
KARAF-4371 : karaf shell scripts use "local" which is not a posix compliant
(cherry picked from commit f8b76c009b069261c6266645afaf20f7b6eeda24)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/799e50c5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/799e50c5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/799e50c5
Branch: refs/heads/karaf-4.0.x
Commit: 799e50c544f8a0405201311d73cc4b3a11a8f01b
Parents: 3dde697
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 29 17:58:15 2016 +0100
Committer: Freeman Fang <fr...@gmail.com>
Committed: Wed Mar 2 15:18:09 2016 +0800
----------------------------------------------------------------------
.../filtered-resources/resources/bin/client | 20 ++++++++++----------
.../filtered-resources/resources/bin/instance | 20 ++++++++++----------
.../main/filtered-resources/resources/bin/shell | 20 ++++++++++----------
.../base/src/main/resources/resources/bin/karaf | 20 ++++++++++----------
4 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/799e50c5/assemblies/features/base/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
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 b900615..6da0f5a 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -162,22 +162,22 @@ setupNativePath() {
}
pathCanonical() {
- local dst="${1}"
- while [ -h "${dst}" ] ; do
- ls=`ls -ld "${dst}"`
+ local_dst="${1}"
+ while [ -h "${local_dst}" ] ; do
+ ls=`ls -ld "${local_dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- dst="$link"
+ local_dst="$link"
else
- dst="`dirname "${dst}"`/$link"
+ local_dst="`dirname "${local_dst}"`/$link"
fi
done
- local bas=`basename "${dst}"`
- local dir=`dirname "${dst}"`
- if [ "$bas" != "$dir" ]; then
- dst="`pathCanonical "$dir"`/$bas"
+ local_bas=`basename "${local_dst}"`
+ local_dir=`dirname "${local_dst}"`
+ if [ "$local_bas" != "$local_dir" ]; then
+ local_dst="`pathCanonical "$local_dir"`/$local_bas"
fi
- echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/799e50c5/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 2931372..47ebbf3 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -162,22 +162,22 @@ setupNativePath() {
}
pathCanonical() {
- local dst="${1}"
- while [ -h "${dst}" ] ; do
- ls=`ls -ld "${dst}"`
+ local_dst="${1}"
+ while [ -h "${local_dst}" ] ; do
+ ls=`ls -ld "${local_dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- dst="$link"
+ local_dst="$link"
else
- dst="`dirname "${dst}"`/$link"
+ local_dst="`dirname "${local_dst}"`/$link"
fi
done
- local bas=`basename "${dst}"`
- local dir=`dirname "${dst}"`
- if [ "$bas" != "$dir" ]; then
- dst="`pathCanonical "$dir"`/$bas"
+ local_bas=`basename "${local_dst}"`
+ local_dir=`dirname "${local_dst}"`
+ if [ "$local_bas" != "$local_dir" ]; then
+ local_dst="`pathCanonical "$local_dir"`/$local_bas"
fi
- echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/799e50c5/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
----------------------------------------------------------------------
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 8a57444..ea7b688 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -162,22 +162,22 @@ setupNativePath() {
}
pathCanonical() {
- local dst="${1}"
- while [ -h "${dst}" ] ; do
- ls=`ls -ld "${dst}"`
+ local_dst="${1}"
+ while [ -h "${local_dst}" ] ; do
+ ls=`ls -ld "${local_dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- dst="$link"
+ local_dst="$link"
else
- dst="`dirname "${dst}"`/$link"
+ local_dst="`dirname "${local_dst}"`/$link"
fi
done
- local bas=`basename "${dst}"`
- local dir=`dirname "${dst}"`
- if [ "$bas" != "$dir" ]; then
- dst="`pathCanonical "$dir"`/$bas"
+ local_bas=`basename "${local_dst}"`
+ local_dir=`dirname "${local_dst}"`
+ if [ "$local_bas" != "$local_dir" ]; then
+ local_dst="`pathCanonical "$local_dir"`/$local_bas"
fi
- echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/799e50c5/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 93236a5..17fd3c7 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -166,22 +166,22 @@ setupNativePath() {
}
pathCanonical() {
- local dst="${1}"
- while [ -h "${dst}" ] ; do
- ls=`ls -ld "${dst}"`
+ local_dst="${1}"
+ while [ -h "${local_dst}" ] ; do
+ ls=`ls -ld "${local_dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- dst="$link"
+ local_dst="$link"
else
- dst="`dirname "${dst}"`/$link"
+ local_dst="`dirname "${local_dst}"`/$link"
fi
done
- local bas=`basename "${dst}"`
- local dir=`dirname "${dst}"`
- if [ "$bas" != "$dir" ]; then
- dst="`pathCanonical "$dir"`/$bas"
+ local_bas=`basename "${local_dst}"`
+ local_dir=`dirname "${local_dst}"`
+ if [ "$local_bas" != "$local_dir" ]; then
+ local_dst="`pathCanonical "$local_dir"`/$local_bas"
fi
- echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {