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 2016/06/09 12:57:11 UTC
karaf git commit: [KARAF-4566] Cleanup in script. This closes #197
Repository: karaf
Updated Branches:
refs/heads/master 76d64a9d2 -> 948890980
[KARAF-4566] Cleanup in script. This closes #197
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/94889098
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/94889098
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/94889098
Branch: refs/heads/master
Commit: 948890980848f3b101dda8dcb6d877d7d9ed4f32
Parents: 76d64a9
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jun 9 14:56:25 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jun 9 14:56:25 2016 +0200
----------------------------------------------------------------------
.../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/94889098/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 6da0f5a..8b121af 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 "${local_dst}" ] ; do
- ls=`ls -ld "${local_dst}"`
+ dst="${1}"
+ while [ -h "${dst}" ] ; do
+ ls=`ls -ld "${dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- local_dst="$link"
+ dst="$link"
else
- local_dst="`dirname "${local_dst}"`/$link"
+ dst="`dirname "${dst}"`/$link"
fi
done
- local_bas=`basename "${local_dst}"`
- local_dir=`dirname "${local_dst}"`
- if [ "$local_bas" != "$local_dir" ]; then
- local_dst="`pathCanonical "$local_dir"`/$local_bas"
+ bas=`basename "${dst}"`
+ dir=`dirname "${dst}"`
+ if [ "$bas" != "$dir" ]; then
+ dst="`pathCanonical "$dir"`/$bas"
fi
- echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/94889098/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 47ebbf3..02862f1 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 "${local_dst}" ] ; do
- ls=`ls -ld "${local_dst}"`
+ dst="${1}"
+ while [ -h "${dst}" ] ; do
+ ls=`ls -ld "${dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- local_dst="$link"
+ dst="$link"
else
- local_dst="`dirname "${local_dst}"`/$link"
+ dst="`dirname "${dst}"`/$link"
fi
done
- local_bas=`basename "${local_dst}"`
- local_dir=`dirname "${local_dst}"`
- if [ "$local_bas" != "$local_dir" ]; then
- local_dst="`pathCanonical "$local_dir"`/$local_bas"
+ bas=`basename "${dst}"`
+ dir=`dirname "${dst}"`
+ if [ "$bas" != "$dir" ]; then
+ dst="`pathCanonical "$dir"`/$bas"
fi
- echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/94889098/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 ea7b688..c91bcf7 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 "${local_dst}" ] ; do
- ls=`ls -ld "${local_dst}"`
+ dst="${1}"
+ while [ -h "${dst}" ] ; do
+ ls=`ls -ld "${dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- local_dst="$link"
+ dst="$link"
else
- local_dst="`dirname "${local_dst}"`/$link"
+ dst="`dirname "${dst}"`/$link"
fi
done
- local_bas=`basename "${local_dst}"`
- local_dir=`dirname "${local_dst}"`
- if [ "$local_bas" != "$local_dir" ]; then
- local_dst="`pathCanonical "$local_dir"`/$local_bas"
+ bas=`basename "${dst}"`
+ dir=`dirname "${dst}"`
+ if [ "$bas" != "$dir" ]; then
+ dst="`pathCanonical "$dir"`/$bas"
fi
- echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/94889098/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 0b706dd..be627e2 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 "${local_dst}" ] ; do
- ls=$(ls -ld "${local_dst}")
+ dst="${1}"
+ while [ -h "${dst}" ] ; do
+ ls=$(ls -ld "${dst}")
link=$(expr "${ls}" : '.*-> \(.*\)$')
if expr "${link}" : '/.*' > /dev/null; then
- local_dst="${link}"
+ dst="${link}"
else
- local_dst="$(dirname "${local_dst}")/${link}"
+ dst="$(dirname "${dst}")/${link}"
fi
done
- local_bas=$(basename "${local_dst}")
- local_dir=$(dirname "${local_dst}")
- if [ "${local_bas}" != "${local_dir}" ]; then
- local_dst="$(pathCanonical "${local_dir}")/${local_bas}"
+ bas=$(basename "${dst}")
+ dir=$(dirname "${dst}")
+ if [ "${bas}" != "${dir}" ]; then
+ dst="$(pathCanonical "${dir}")/${bas}"
fi
- echo "${local_dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
+ echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
}
locateJava() {