svn commit: r1304018 - /incubator/flume/trunk/bin/flume-ng

[ar...@apache.org]

Author: arvind
Date: Thu Mar 22 19:58:25 2012
New Revision: 1304018

URL: http://svn.apache.org/viewvc?rev=1304018&view=rev
Log:
FLUME-1046. Invoking flume-ng script from bin directory fails.

(Mike Percy via Arvind Prabhakar)

Modified:
    incubator/flume/trunk/bin/flume-ng

Modified: incubator/flume/trunk/bin/flume-ng
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/bin/flume-ng?rev=1304018&r1=1304017&r2=1304018&view=diff
==============================================================================
--- incubator/flume/trunk/bin/flume-ng (original)
+++ incubator/flume/trunk/bin/flume-ng Thu Mar 22 19:58:25 2012
@@ -215,7 +215,7 @@ if [ -z "${JAVA_HOME}" ] ; then
   else
     JAVA_DEFAULT=`type -p java`
     [ -n "$JAVA_DEFAULT" ] || error "Unable to find java executable. Is it in your PATH?" 1
-    JAVA_HOME=$(dirname $(dirname $JAVA_DEFAULT))
+    JAVA_HOME=$(cd $(dirname $JAVA_DEFAULT)/..; pwd)
   fi
 fi
 
@@ -223,7 +223,7 @@ fi
 
 # figure out where the flume distribution is
 if [ -z "${FLUME_HOME}" ] ; then
-  FLUME_HOME=$(cd $(dirname $(dirname $0)); pwd)
+  FLUME_HOME=$(cd $(dirname $0)/..; pwd)
 fi
 
 # If the user hasn't overridden the classpath, build it from the dist lib dir