You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/12 06:43:09 UTC
[19/50] incubator-kylin git commit: fix script
fix script
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/09f4bc3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/09f4bc3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/09f4bc3b
Branch: refs/heads/inverted-index
Commit: 09f4bc3b050832c731b8fe0175fc88e086a409c8
Parents: 5386ccd
Author: qianhao.zhou <qi...@ebay.com>
Authored: Tue Feb 10 17:59:31 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Tue Feb 10 17:59:31 2015 +0800
----------------------------------------------------------------------
bin/start-kylin.sh | 4 ++--
script/download-tomcat.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/09f4bc3b/bin/start-kylin.sh
----------------------------------------------------------------------
diff --git a/bin/start-kylin.sh b/bin/start-kylin.sh
index a6aabdf..735de53 100755
--- a/bin/start-kylin.sh
+++ b/bin/start-kylin.sh
@@ -49,11 +49,11 @@ hbase -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
-Djava.io.tmpdir=${tomcat_root}/temp \
-Dkylin.hive.dependency=${hive_dependency} \
-Dspring.profiles.active=${spring_profile} \
-org.apache.hadoop.util.RunJar ${tomcat_root}/bin/bootstrap.jar org.apache.catalina.startup.Bootstrap start > ${tomcat_root}/logs/kylin_sandbox.log 2>&1 &
+org.apache.hadoop.util.RunJar ${tomcat_root}/bin/bootstrap.jar org.apache.catalina.startup.Bootstrap start > ${tomcat_root}/logs/kylin.log 2>&1 &
echo "A new Kylin instance is started by $USER, stop it using \"stop-kylin.sh\""
if [ "$useSandbox" = "true" ]
then echo "Please visit http://<your_sandbox_ip>:7070/kylin to play with the cubes! (Useranme: ADMIN, Password: KYLIN)"
else
echo "Please visit http://<ip>:7070/kylin"
fi
-echo "You can check the log at ${tomcat_root}/logs/kylin_sandbox.log"
+echo "You can check the log at ${tomcat_root}/logs/kylin.log"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/09f4bc3b/script/download-tomcat.sh
----------------------------------------------------------------------
diff --git a/script/download-tomcat.sh b/script/download-tomcat.sh
index fdbe440..1751541 100644
--- a/script/download-tomcat.sh
+++ b/script/download-tomcat.sh
@@ -8,13 +8,13 @@ rm -rf tomcat
if [ ! -f "apache-tomcat-7.0.59.tar.gz" ]
then
echo "not binary file found"
- wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.59.tar.gz
+ wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.tar.gz || echo "download tomcat failed"
else
if [ ! `md5sum apache-tomcat-7.0.59.tar.gz | awk '{print $1}'` -eq "ec570258976edf9a833cd88fd9220909" ]
then
echo "md5 check failed"
rm apache-tomcat-7.0.59.tar.gz
- wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.59.tar.gz
+ wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.tar.gz || echo "download tomcat failed"
fi
fi