incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/4] git commit: hadoop env if else fixed
Date Fri, 10 Apr 2015 12:52:47 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master 3a03fd402 -> 77e1f4f2f


hadoop env if else fixed

Signed-off-by: Aaron McCurry <amccurry@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/5209056b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/5209056b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/5209056b

Branch: refs/heads/master
Commit: 5209056be43b7411a7c5641f4fbc060c1691be5c
Parents: 049f928
Author: WOO-CHEOL CHOI <socialpercon@gmail.com>
Authored: Fri Mar 27 15:57:31 2015 +0900
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Apr 10 08:16:22 2015 -0400

----------------------------------------------------------------------
 .../src/main/scripts/bin/blur-config.sh         | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5209056b/distribution/src/main/scripts/bin/blur-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/bin/blur-config.sh b/distribution/src/main/scripts/bin/blur-config.sh
index bc7032f..f419812 100755
--- a/distribution/src/main/scripts/bin/blur-config.sh
+++ b/distribution/src/main/scripts/bin/blur-config.sh
@@ -66,48 +66,48 @@ for f in $BLUR_HOME/lib/*.war; do
 done
 
 if [ -z "$HADOOP_HOME" ]; then
+  export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1`
   BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
 
-  for f in $HADOOP_HOME/share/hadoop/mapreduce/*.jar; do
+  for f in $HADOOP_HOME/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/share/hadoop/mapreduce/lib/*.jar; do
+  for f in $HADOOP_HOME/lib/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/share/hadoop/yarn/*.jar; do
+  for f in $HADOOP_HOME/lib/jsp-*/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
+  
+else
 
-  for f in $HADOOP_HOME/share/hadoop/yarn/lib/*.jar; do
+  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
+
+  for f in $HADOOP_HOME/share/hadoop/mapreduce/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/share/hadoop/common/*.jar; do
+  for f in $HADOOP_HOME/share/hadoop/mapreduce/lib/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/share/hadoop/common/lib/*.jar; do
+  for f in $HADOOP_HOME/share/hadoop/yarn/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
-  
-else
-  export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1`
-  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
 
-  for f in $HADOOP_HOME/*.jar; do
+  for f in $HADOOP_HOME/share/hadoop/yarn/lib/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/lib/*.jar; do
+  for f in $HADOOP_HOME/share/hadoop/common/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
 
-  for f in $HADOOP_HOME/lib/jsp-*/*.jar; do
+  for f in $HADOOP_HOME/share/hadoop/common/lib/*.jar; do
     BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
   done
-
 fi
 
 


Mime
View raw message