You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by qh...@apache.org on 2015/06/16 10:08:34 UTC
[2/2] incubator-kylin git commit: KYLIN-828
KYLIN-828
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/22cdfa2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/22cdfa2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/22cdfa2a
Branch: refs/heads/0.8
Commit: 22cdfa2a8c4d90fb836eda11f52bceb200043933
Parents: 9180d6a
Author: qianhao.zhou <qi...@ebay.com>
Authored: Tue Jun 16 15:56:43 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Tue Jun 16 16:07:40 2015 +0800
----------------------------------------------------------------------
bin/check-sandbox-properties.sh | 9 +++++++++
bin/kylin.sh | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/22cdfa2a/bin/check-sandbox-properties.sh
----------------------------------------------------------------------
diff --git a/bin/check-sandbox-properties.sh b/bin/check-sandbox-properties.sh
new file mode 100644
index 0000000..cd037e3
--- /dev/null
+++ b/bin/check-sandbox-properties.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+result=
+for i in `cat ${KYLIN_HOME}/conf/kylin.properties | grep 'kylin.sandbox' | grep -v '^#' |awk -F '=' '{print $2}' | cut -c 1-4`
+do
+ :
+ result=$i
+done
+echo $result
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/22cdfa2a/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/bin/kylin.sh b/bin/kylin.sh
index 97c29c5..4633b9f 100644
--- a/bin/kylin.sh
+++ b/bin/kylin.sh
@@ -22,7 +22,7 @@ then
- useSandbox=`cat ${KYLIN_HOME}/conf/kylin.properties | grep 'kylin.sandbox' | awk -F '=' '{print $2}'`
+ useSandbox=`sh ${dir}/check-sandbox-properties.sh`
spring_profile="default"
if [ "$useSandbox" = "true" ]
then spring_profile="sandbox"
@@ -88,7 +88,7 @@ then
fi
if [ $2 == "start" ]
then
- useSandbox=`cat ${KYLIN_HOME}/conf/kylin.properties | grep 'kylin.sandbox' | awk -F '=' '{print $2}'`
+ useSandbox=`sh ${dir}/check-sandbox-properties.sh`
spring_profile="default"
if [ "$useSandbox" = "true" ]
then spring_profile="sandbox"