Author: jbonofre
Date: Tue Sep 18 13:35:00 2012
New Revision: 1387150
URL: http://svn.apache.org/viewvc?rev=1387150&view=rev
Log:
[KARAF-1756] Enhance readlink test in wrapper
Modified:
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
Modified:
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service?rev=1387150&r1=1387149&r2=1387150&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
(original)
+++
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
Tue Sep 18 13:35:00 2012
@@ -18,7 +18,7 @@
# ------------------------------------------------------------------------
# If not set, try to determine the JAVA_HOME using the JDK and fall back to JRE
-if [ -x /bin/readlink ]; then
+if [ `which readlink` ]; then
[ -z $JAVA_HOME ] && [ -x /usr/bin/javac ] && export JAVA_HOME="$(readlink
-f /usr/bin/javac | sed 's:/bin/javac::')"
[ -z $JAVA_HOME ] && [ -x /usr/bin/java ] && export JAVA_HOME="$(readlink -f
/usr/bin/java | sed 's:/bin/java::')"
fi
