From f8b76c009b069261c6266645afaf20f7b6eeda24 Mon Sep 17 00:00:00 2001 From: lburgazzoli Date: Mon, 29 Feb 2016 17:58:15 +0100 Subject: [PATCH] KARAF-4371 : karaf shell scripts use "local" which is not a posix compliant --- .../filtered-resources/resources/bin/client | 20 +++++++++---------- .../filtered-resources/resources/bin/instance | 20 +++++++++---------- .../filtered-resources/resources/bin/shell | 20 +++++++++---------- .../src/main/resources/resources/bin/karaf | 20 +++++++++---------- 4 files changed, 40 insertions(+), 40 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 b9006152e1a..6da0f5aa483 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() { 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 2931372fc89..47ebbf385fa 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() { 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 8a57444c223..ea7b6887aa1 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() { diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf index 91454314f71..25ee41fbbb4 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() {