incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/4] git commit: blur config enhanced
Date Fri, 10 Apr 2015 12:52:48 GMT
blur config enhanced

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/049f9280
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/049f9280
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/049f9280

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

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


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/049f9280/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 92ff8f6..bc7032f 100755
--- a/distribution/src/main/scripts/bin/blur-config.sh
+++ b/distribution/src/main/scripts/bin/blur-config.sh
@@ -65,23 +65,51 @@ for f in $BLUR_HOME/lib/*.war; do
   BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
 done
 
-if [ -n "$HADOOP_HOME" ]; then
+if [ -z "$HADOOP_HOME" ]; then
+  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/mapreduce/lib/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+
+  for f in $HADOOP_HOME/share/hadoop/yarn/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+
+  for f in $HADOOP_HOME/share/hadoop/yarn/lib/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+
+  for f in $HADOOP_HOME/share/hadoop/common/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+
+  for f in $HADOOP_HOME/share/hadoop/common/lib/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+  
+else
   export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1`
-fi
+  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
 
-BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
+  for f in $HADOOP_HOME/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
 
-for f in $HADOOP_HOME/*.jar; do
-  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
-done
+  for f in $HADOOP_HOME/lib/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
 
-for f in $HADOOP_HOME/lib/*.jar; do
-  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
-done
+  for f in $HADOOP_HOME/lib/jsp-*/*.jar; do
+    BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
+  done
+
+fi
 
-for f in $HADOOP_HOME/lib/jsp-*/*.jar; do
-  BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
-done
 
 export BLUR_CLASSPATH
 


Mime
View raw message