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 2012/09/21 07:55:55 UTC
svn commit: r1388333 -
/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
Author: jbonofre
Date: Fri Sep 21 05:55:54 2012
New Revision: 1388333
URL: http://svn.apache.org/viewvc?rev=1388333&view=rev
Log:
[KARAF-1756] Update readlink test to work with "all" Unix
Modified:
karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
Modified: karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service?rev=1388333&r1=1388332&r2=1388333&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service Fri Sep 21 05:55:54 2012
@@ -18,7 +18,7 @@
# ------------------------------------------------------------------------
# If not set, try to determine the JAVA_HOME using the JDK and fall back 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