Author: jbonofre
Date: Fri Sep 21 04:53:30 2012
New Revision: 1388322
URL: http://svn.apache.org/viewvc?rev=1388322&view=rev
Log:
[KARAF-1756] Change readlink test to be "all" Unix compliant
Modified:
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
Modified:
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
URL:
http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service?rev=1388322&r1=1388321&r2=1388322&view=diff
==============================================================================
---
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
(original)
+++
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
Fri Sep 21 04:53:30 2012
@@ -18,7 +18,7 @@
# ------------------------------------------------------------------------
# JAVA_HOME, trying the JDK first and fallback to JRE
-if [ `which readlink` ]; then
+if [ -x /bin/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
