Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-698 Remove full path + executability check of java 

Fixes issues with systems that have no "which", as well as the fallback
to using plain "java" from PATH.
This commit is contained in:
Ville Skyttä 2016-08-25 10:05:15 +03:00 committed by Clebert Suconic
parent dd0bd97b8f
commit 5f8d9a2746
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
View File

@ -86,19 +86,10 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD=`which java 2> /dev/null `
if [ -z "$JAVACMD" ] ; then
JAVACMD=java
fi
JAVACMD=java
fi
fi
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
exit 1
fi
if $cygwin ; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`

12
artemis-distribution/src/main/resources/bin/artemis
View File

@ -80,20 +80,10 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD=`which java 2> /dev/null `
if [ -z "$JAVACMD" ] ; then
JAVACMD=java
fi
JAVACMD=java
fi
fi
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
exit 1
fi
if $cygwin ; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`