SHIMODA Piro Hiroshi
null+****@clear*****
Mon Sep 29 05:26:49 JST 2014
SHIMODA "Piro" Hiroshi 2014-09-29 05:26:49 +0900 (Mon, 29 Sep 2014) New Revision: f519a5e19a6671efbf814006533fa9afccb03af0 https://github.com/droonga/droonga-http-server/commit/f519a5e19a6671efbf814006533fa9afccb03af0 Message: nstall required platform packages always. Command-based detection doesn't work as expected, if a required package have no executable command. Modified files: install.sh Modified: install.sh (+2 -14) =================================================================== --- install.sh 2014-09-29 01:46:22 +0900 (f9ec6fe) +++ install.sh 2014-09-29 05:26:49 +0900 (55b75f1) @@ -47,10 +47,6 @@ EXPRESS_DROONGA_REPOSITORY_URL=git://github.com/droonga/express-droonga.git#mast : ${HOST:=Auto Detect} : ${ENGINE_HOST:=Auto Detect} -REQUIRED_COMMANDS="curl npm" -[ "$VERSION" = "master" ] && - REQUIRED_COMMANDS="$REQUIRED_COMMANDS git" - case $(uname) in Darwin|*BSD|CYGWIN*) sed="sed -E" ;; *) sed="sed -r" ;; @@ -100,15 +96,6 @@ exist_user() { id "$1" > /dev/null 2>&1 } -prepare_environment() { - if exist_all_commands $REQUIRED_COMMANDS; then - return 0 - fi - - echo "Preparing the environment..." - prepare_environment_in_$PLATFORM -} - prepare_user() { echo "" echo "Preparing the user..." @@ -312,7 +299,8 @@ prepare_environment_in_centos() { install() { mkdir -p $TEMPDIR - prepare_environment + echo "Preparing the environment..." + prepare_environment_in_$PLATFORM echo "" if [ "$VERSION" = "master" ]; then -------------- next part -------------- HTML����������������������������...Download
