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:13 UTC

[23/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/78689e34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/78689e34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/78689e34

Branch: refs/heads/inverted-index
Commit: 78689e34d77e12145433a45fbab4ba3d1832fd6b
Parents: 09f4bc3
Author: qianhao.zhou <qi...@ebay.com>
Authored: Wed Feb 11 11:49:12 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Wed Feb 11 11:49:12 2015 +0800

----------------------------------------------------------------------
 bin/start-kylin.sh | 3 ---
 script/compress.sh | 7 ++++---
 script/package.sh  | 2 +-
 script/prepare.sh  | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/78689e34/bin/start-kylin.sh
----------------------------------------------------------------------
diff --git a/bin/start-kylin.sh b/bin/start-kylin.sh
index 735de53..9225fb6 100755
--- a/bin/start-kylin.sh
+++ b/bin/start-kylin.sh
@@ -31,9 +31,6 @@ spring_profile="default"
 if [ "$useSandbox" = "true" ]
     then spring_profile="sandbox"
 fi
-rm -rf ${tomcat_root}/webapps/kylin*
-cp ${dir}/../lib/kylin-server-*.war ${tomcat_root}/webapps/kylin.war
-
 source ${dir}/find-hive-dependency.sh
 
 export HBASE_CLASSPATH_PREFIX=${tomcat_root}/bin/bootstrap.jar:${tomcat_root}/bin/tomcat-juli.jar:${tomcat_root}/lib/*:$HBASE_CLASSPATH_PREFIX

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/78689e34/script/compress.sh
----------------------------------------------------------------------
diff --git a/script/compress.sh b/script/compress.sh
index 6221b2b..01a8376 100644
--- a/script/compress.sh
+++ b/script/compress.sh
@@ -13,6 +13,7 @@ fi
 
 #package tgz
 echo 'package tgz'
-tar -cvzf kylin-${version}.tgz lib bin conf tomcat
-
-rm -rf tomcat/webapps/*
+mkdir kylin-${version}
+cp -r lib bin conf tomcat kylin-${version}
+tar -cvzf kylin-${version}.tgz kylin-${version}
+rm -rf kylin-${version}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/78689e34/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
index 018491e..556467a 100755
--- a/script/package.sh
+++ b/script/package.sh
@@ -26,8 +26,8 @@ version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpress
 echo "kylin version: ${version}"
 export version
 
+sh ${dir}/download-tomcat.sh || { exit 1; }
 sh ${dir}/build.sh || { exit 1; }
 sh ${dir}/prepare.sh || { exit 1; }
-sh ${dir}/download-tomcat.sh || { exit 1; }
 sh ${dir}/compress.sh || { exit 1; }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/78689e34/script/prepare.sh
----------------------------------------------------------------------
diff --git a/script/prepare.sh b/script/prepare.sh
index 8a855e1..3b30ac2 100644
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -13,7 +13,7 @@ fi
 echo "copy lib file"
 rm -rf lib
 mkdir lib
-cp server/target/kylin-server-${version}.war lib
+cp server/target/kylin-server-${version}.war tomcat/webapps/kylin.war
 cp job/target/kylin-job-${version}-job.jar lib/kylin-job-${version}.jar
 cp storage/target/kylin-storage-${version}-coprocessor.jar lib/kylin-coprocessor-${version}.jar
 
@@ -28,5 +28,5 @@ cd webapp/dist
 for f in * .[^.]*
 do
     echo "Adding $f to war"
-    jar -uf ../../lib/kylin-server-${version}.war $f
+    jar -uf ../../tomcat/webapps/kylin.war $f
 done
\ No newline at end of file