Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 6030 - "karaf" script invokes /bin/sh but requires /bin/bash functions
[controller.git]
/
karaf
/
opendaylight-karaf-resources
/
src
/
main
/
resources
/
bin
/
karaf
diff --git
a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
index 53906c6b3f98d03cd5a9a8bc542d78153c4c48b7..58392996e947ee293291b1039787acf582615ff2 100755
(executable)
--- a/
karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
+++ b/
karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
@@
-169,7
+169,7
@@
setupNativePath() {
}
pathCanonical() {
}
pathCanonical() {
-
local
dst="${1}"
+ dst="${1}"
while [ -h "${dst}" ] ; do
ls=`ls -ld "${dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
while [ -h "${dst}" ] ; do
ls=`ls -ld "${dst}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
@@
-179,8
+179,8
@@
pathCanonical() {
dst="`dirname "${dst}"`/$link"
fi
done
dst="`dirname "${dst}"`/$link"
fi
done
-
local
bas=`basename "${dst}"`
-
local
dir=`dirname "${dst}"`
+ bas=`basename "${dst}"`
+ dir=`dirname "${dst}"`
if [ "$bas" != "$dir" ]; then
dst="`pathCanonical "$dir"`/$bas"
fi
if [ "$bas" != "$dir" ]; then
dst="`pathCanonical "$dir"`/$bas"
fi