Kouhei Sutou
null+****@clear*****
Wed Mar 27 00:57:16 JST 2013
Kouhei Sutou 2013-03-27 00:57:16 +0900 (Wed, 27 Mar 2013) New Revision: c3d66c3d206731290b83f0fb11117b35dbb4caf4 https://github.com/mroonga/mroonga/commit/c3d66c3d206731290b83f0fb11117b35dbb4caf4 Message: travis: we should not change working directory... Modified files: tools/travis/install.sh Modified: tools/travis/install.sh (+16 -14) =================================================================== --- tools/travis/install.sh 2013-03-27 00:48:24 +0900 (7134a8d) +++ tools/travis/install.sh 2013-03-27 00:57:16 +0900 (f784ecb) @@ -30,6 +30,19 @@ if [ ! -f /usr/lib/groonga/plugins/tokenizers/mecab.so ]; then sudo apt-get -qq -y install groonga-tokenizer-mecab fi +if [ "${MRN_BUNDLED}" = "yes" ]; then + mkdir -p .mroonga + mv * .mroonga/ + sudo apt-get -qq -y build-dep mysql-server + # Support MariaDB for now. + download_base=http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/${MYSQL_VERSION} + tar_gz=${MYSQL_VERSION}.tar.gz + curl -O ${download_base}/kvm-tarbake-jaunty-x86/${tar_gz} + tar xzf $tar_gz + mv ${MYSQL_VERSION}/* ./ + mv .mroonga storage/mroonga + rm -rf ${MYSQL_VERSION} +else mkdir -p vendor cd vendor @@ -61,19 +74,6 @@ case "$MYSQL_VERSION" in fi ;; mariadb-*) - if [ "${MRN_BUNDLED}" = "yes" ]; then - cd .. - mkdir -p .mroonga - mv * .mroonga/ - sudo apt-get -qq -y build-dep mysql-server - download_base=http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/${MYSQL_VERSION} - tar_gz=${MYSQL_VERSION}.tar.gz - curl -O ${download_base}/kvm-tarbake-jaunty-x86/${tar_gz} - tar xzf $tar_gz - mv ${MYSQL_VERSION}/* ./ - mv .mroonga storage/mroonga - rm -rf ${MYSQL_VERSION} - else distribution=$(lsb_release --short --id | tr 'A-Z' 'a-z') code_name=$(lsb_release --short --codename) component=main @@ -86,6 +86,8 @@ EOF sudo apt-get -qq -y install mysql-server mysql-testsuite apt-get -qq source mysql-server ln -s $(find . -maxdepth 1 -type d | sort | tail -1) mysql - fi ;; esac + +cd .. +fi -------------- next part -------------- HTML����������������������������...Download