You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/25 15:14:25 UTC
[2/2] activemq-artemis git commit: ARTEMIS-698 Remove full path +
executability check of java
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.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5f8d9a27
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5f8d9a27
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5f8d9a27
Branch: refs/heads/master
Commit: 5f8d9a2746f62af97c1f396b6a29d890bcad8699
Parents: dd0bd97
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 10:05:15 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 09:55:32 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/commands/bin/artemis | 11 +----------
artemis-distribution/src/main/resources/bin/artemis | 12 +-----------
2 files changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f8d9a27/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index b21e8c8..10da1c9 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -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"`
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f8d9a27/artemis-distribution/src/main/resources/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index 43f70a9..9aef511 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -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"`