flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1328996 - /incubator/flume/trunk/bin/flume-ng
Date Sun, 22 Apr 2012 23:33:33 GMT
Author: brock
Date: Sun Apr 22 23:33:33 2012
New Revision: 1328996

URL: http://svn.apache.org/viewvc?rev=1328996&view=rev
Log:
FLUME-1130: flume-ng script bad ordering on FLUME_HOME var

(Mike Percy via Brock Noland)

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=1328996&r1=1328995&r2=1328996&view=diff
==============================================================================
--- incubator/flume/trunk/bin/flume-ng (original)
+++ incubator/flume/trunk/bin/flume-ng Sun Apr 22 23:33:33 2012
@@ -145,7 +145,6 @@ run_flume() {
 ################################
 
 # set default params
-FLUME_HOME=$(cd $(dirname $0)/..; pwd)
 FLUME_CLASSPATH=""
 FLUME_JAVA_LIBRARY_PATH=""
 JAVA_OPTS="-Xmx20m"
@@ -235,6 +234,10 @@ if [ -n "${opt_classpath}" ]; then
   fi
 fi
 
+if [ -z "${FLUME_HOME}" ]; then
+  FLUME_HOME=$(cd $(dirname $0)/..; pwd)
+fi
+
 # prepend $FLUME_HOME/lib jars to the specified classpath (if any)
 if [ -n "${FLUME_CLASSPATH}" ] ; then
   FLUME_CLASSPATH="${FLUME_HOME}/lib/*:$FLUME_CLASSPATH"



Mime
View raw message