azkaban-developers

Merge pull request #207 from sspinc/fix-hadoop-home-checks Fix …

3/10/2014 9:35:20 PM

HADOOP_HOME and HIVE_HOME checks

David Z. Chen

Commit: a863f74

Tree: 2ef6100

Parents: e0cb48c
a6d2a9c

Changes

src/package/execserver/bin/azkaban-executor-start.sh 4(+2 -2)

src/package/soloserver/bin/azkaban-solo-start.sh 4(+2 -2)

src/package/webserver/bin/azkaban-web-start.sh 4(+2 -2)

Details

src/package/execserver/bin/azkaban-executor-start.sh 4(+2 -2)

diff --git a/src/package/execserver/bin/azkaban-executor-start.sh b/src/package/execserver/bin/azkaban-executor-start.sh
index 9c706f9..c281890 100755
--- a/src/package/execserver/bin/azkaban-executor-start.sh
+++ b/src/package/execserver/bin/azkaban-executor-start.sh
@@ -21,7 +21,7 @@ do
   CLASSPATH=$CLASSPATH:$file
 done
 
-if [ "HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME" != "" ]; then
         echo "Using Hadoop from $HADOOP_HOME"
         CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
         JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
@@ -29,7 +29,7 @@ else
         echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
-if [ "HIVE_HOME" != "" ]; then
+if [ "$HIVE_HOME" != "" ]; then
         echo "Using Hive from $HIVE_HOME"
         CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi

src/package/soloserver/bin/azkaban-solo-start.sh 4(+2 -2)

diff --git a/src/package/soloserver/bin/azkaban-solo-start.sh b/src/package/soloserver/bin/azkaban-solo-start.sh
index 5e5a0a3..68c08d0 100755
--- a/src/package/soloserver/bin/azkaban-solo-start.sh
+++ b/src/package/soloserver/bin/azkaban-solo-start.sh
@@ -21,7 +21,7 @@ do
   CLASSPATH=$CLASSPATH:$file
 done
 
-if [ "HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME" != "" ]; then
         echo "Using Hadoop from $HADOOP_HOME"
         CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
         JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
@@ -29,7 +29,7 @@ else
         echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
-if [ "HIVE_HOME" != "" ]; then
+if [ "$HIVE_HOME" != "" ]; then
         echo "Using Hive from $HIVE_HOME"
         CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi

src/package/webserver/bin/azkaban-web-start.sh 4(+2 -2)

diff --git a/src/package/webserver/bin/azkaban-web-start.sh b/src/package/webserver/bin/azkaban-web-start.sh
index 30e8056..744320a 100755
--- a/src/package/webserver/bin/azkaban-web-start.sh
+++ b/src/package/webserver/bin/azkaban-web-start.sh
@@ -21,7 +21,7 @@ do
   CLASSPATH=$CLASSPATH:$file
 done
 
-if [ "HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME" != "" ]; then
         echo "Using Hadoop from $HADOOP_HOME"
         CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
         JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
@@ -29,7 +29,7 @@ else
         echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
-if [ "HIVE_HOME" != "" ]; then
+if [ "$HIVE_HOME" != "" ]; then
         echo "Using Hive from $HIVE_HOME"
         CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi