You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/06/06 04:52:27 UTC
[10/23] git commit: DRILL-322 - drill_dumpcat script works more like
the other scripts now
DRILL-322 - drill_dumpcat script works more like the other scripts now
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/61dea895
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/61dea895
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/61dea895
Branch: refs/heads/master
Commit: 61dea8957c3e2c08cffb9a8536dcc90095decfa6
Parents: ce007db
Author: Patrick Wong <pw...@maprtech.com>
Authored: Mon Jun 2 20:15:57 2014 +0000
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Jun 4 19:25:44 2014 -0700
----------------------------------------------------------------------
distribution/src/resources/drill_dumpcat | 31 ---------------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/61dea895/distribution/src/resources/drill_dumpcat
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill_dumpcat b/distribution/src/resources/drill_dumpcat
index 1747c9a..a2ea4d3 100755
--- a/distribution/src/resources/drill_dumpcat
+++ b/distribution/src/resources/drill_dumpcat
@@ -20,37 +20,6 @@ bin=`cd "$bin">/dev/null; pwd`
. "$bin"/drill-config.sh
-if [ -z $JAVA_HOME ]
-then
- JAVA=`which java`
-else
- JAVA=`find -L $JAVA_HOME -name java | head -n 1`
-fi
-
-if [ -e $JAVA ]; then
- echo ""
-else
- echo "Java not found."
- exit 1
-fi
-
-$JAVA -version 2>&1 | grep "version" | egrep -e "1.7" > /dev/null
-if [ $? -ne 0 ]; then
- echo "Java 1.7 is required to run Apache Drill."
- exit 1
-fi
-
-# get log directory
-if [ "$DRILL_LOG_DIR" = "" ]; then
- export DRILL_LOG_DIR=/var/log/drill
-fi
-
-CP=$DRILL_HOME/jars/*:$CP
-CP=$DRILL_HOME/lib/*:$CP
-
-CP=$DRILL_CONF_DIR:$CP
-CP=$HADOOP_CLASSPATH:$CP
-
DRILL_SHELL_JAVA_OPTS="$DRILL_SHELL_JAVA_OPTS -Dlog.path=$DRILL_LOG_DIR/drill_dumpcat.log"
exec $JAVA $DRILL_SHELL_JAVA_OPTS $DRILL_JAVA_OPTS -cp $CP org.apache.drill.exec.client.DumpCat $@