kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject [07/50] kylin git commit: give better message in find-hive-dependency.sh
Date Tue, 22 Dec 2015 08:44:05 GMT
give better message in find-hive-dependency.sh

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b9c439ed
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b9c439ed
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b9c439ed

Branch: refs/heads/master
Commit: b9c439eda6f3087ebb2056cb32a1ce14c06a1006
Parents: 01ea9bc
Author: shaofengshi <shaofengshi@apache.org>
Authored: Mon Nov 23 10:23:01 2015 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Mon Nov 23 10:23:01 2015 +0800

----------------------------------------------------------------------
 bin/check-env.sh             |  0
 bin/find-hbase-dependency.sh |  0
 bin/find-hive-dependency.sh  | 13 +++++++++----
 bin/get-properties.sh        |  0
 bin/health-check.sh          |  0
 bin/kylin.sh                 |  0
 bin/metastore.sh             |  1 +
 bin/performance-monitor.sh   |  0
 bin/sample.sh                |  0
 9 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/check-env.sh
----------------------------------------------------------------------
diff --git a/bin/check-env.sh b/bin/check-env.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/find-hbase-dependency.sh
----------------------------------------------------------------------
diff --git a/bin/find-hbase-dependency.sh b/bin/find-hbase-dependency.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --git a/bin/find-hive-dependency.sh b/bin/find-hive-dependency.sh
old mode 100644
new mode 100755
index 16b4db3..ee36fc3
--- a/bin/find-hive-dependency.sh
+++ b/bin/find-hive-dependency.sh
@@ -37,12 +37,17 @@ do
     fi
 done
 
-# in some versions of hdp hcatalog is not in hive's classpath, find it separately
+# in some versions of hive hcatalog is not in hive's classpath, find it separately
 if [ -z "$HCAT_HOME" ]
 then
-    echo "HCAT_HOME not found, try to find hcatalog path from hdp home"
-    hdp_home=`echo $hive_exec_path | awk -F '/hive.*/lib/' '{print $1}'`
-    hcatalog_home=${hdp_home}/hive-hcatalog
+    echo "HCAT_HOME not found, try to find hcatalog path from hive home"
+    hive_home=`echo $hive_exec_path | awk -F '/hive.*/lib/' '{print $1}'`
+    if [ -d "${hive_home}/hive-hcatalog" ]; then
+      hcatalog_home=${hive_home}/hive-hcatalog
+    else 
+      echo "Couldn't locate hcatalog installation, please make sure it is installed and set
HCAT_HOME to the path."
+      exit 1
+    fi
 else
     echo "HCAT_HOME is set to: $HCAT_HOME, use it to find hcatalog path:"
     hcatalog_home=${HCAT_HOME}

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/get-properties.sh
----------------------------------------------------------------------
diff --git a/bin/get-properties.sh b/bin/get-properties.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/health-check.sh
----------------------------------------------------------------------
diff --git a/bin/health-check.sh b/bin/health-check.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/bin/kylin.sh b/bin/kylin.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/metastore.sh
----------------------------------------------------------------------
diff --git a/bin/metastore.sh b/bin/metastore.sh
index 6d2279f..39593d4 100755
--- a/bin/metastore.sh
+++ b/bin/metastore.sh
@@ -26,6 +26,7 @@
 
 
 dir=$(dirname ${0})
+source ${dir}/check-env.sh
 
 if [ $1 == "backup" ]
 then

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/performance-monitor.sh
----------------------------------------------------------------------
diff --git a/bin/performance-monitor.sh b/bin/performance-monitor.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/b9c439ed/bin/sample.sh
----------------------------------------------------------------------
diff --git a/bin/sample.sh b/bin/sample.sh
old mode 100644
new mode 100755


Mime
View raw message