YUKI Hiroshi
null+****@clear*****
Fri Dec 19 10:25:57 JST 2014
YUKI Hiroshi 2014-12-19 10:25:57 +0900 (Fri, 19 Dec 2014) New Revision: fed1c365a9096535e98a99629b6cdf89f87d2904 https://github.com/droonga/droonga-http-server/commit/fed1c365a9096535e98a99629b6cdf89f87d2904 Message: Make it easy to install from branch Modified files: install.sh Modified: install.sh (+8 -6) =================================================================== --- install.sh 2014-12-02 10:19:30 +0900 (dab2b36) +++ install.sh 2014-12-19 10:25:57 +0900 (5579028) @@ -247,7 +247,7 @@ use_master_express_droonga() { > package.json } -install_master() { +install_from_repository() { cd $TEMPDIR if [ -d $NAME ] @@ -255,11 +255,13 @@ install_master() { cd $NAME git reset --hard git pull --rebase + git checkout $VERSION use_master_express_droonga npm update else git clone $REPOSITORY_URL cd $NAME + git checkout $VERSION use_master_express_droonga fi npm install -g @@ -268,7 +270,7 @@ install_master() { } download_url() { - if [ "$VERSION" = "master" ]; then + if [ "$VERSION" != "release" ]; then echo "$DOWNLOAD_URL_BASE/master/$1" else echo "$DOWNLOAD_URL_BASE/v$(installed_version)/$1" @@ -286,7 +288,7 @@ prepare_environment_in_debian() { apt-get update apt-get install -y curl nodejs nodejs-legacy npm - if [ "$VERSION" = "master" ]; then + if [ "$VERSION" != "release" ]; then apt-get install -y git fi } @@ -310,7 +312,7 @@ prepare_environment_in_centos() { yum -y install curl yum -y --enablerepo=epel install npm - if [ "$VERSION" = "master" ]; then + if [ "$VERSION" != "release" ]; then yum -y install git fi } @@ -325,9 +327,9 @@ install() { prepare_environment_in_$PLATFORM echo "" - if [ "$VERSION" = "master" ]; then + if [ "$VERSION" != "release" ]; then echo "Installing $NAME from the git repository..." - install_master + install_from_repository else echo "Installing $NAME from npmjs.org..." npm install -g droonga-http-server -------------- next part -------------- HTML����������������������������...다운로드
