SHIMODA Piro Hiroshi
null+****@clear*****
Mon Sep 29 05:24:30 JST 2014
SHIMODA "Piro" Hiroshi 2014-09-29 05:24:30 +0900 (Mon, 29 Sep 2014) New Revision: d3cfe2cb8a267f592b68f19a3e5a8020611a12b3 https://github.com/droonga/droonga-engine/commit/d3cfe2cb8a267f592b68f19a3e5a8020611a12b3 Message: Install required platform packages always. We need to install "ruby-dev" or "ruby-devel" to be installed but they have no executable command. Command-based detection doesn't work as expected. Modified files: install.sh Modified: install.sh (+2 -14) =================================================================== --- install.sh 2014-09-29 01:50:32 +0900 (280b830) +++ install.sh 2014-09-29 05:24:30 +0900 (d16b6be) @@ -44,10 +44,6 @@ TEMPDIR=/tmp/install-$NAME : ${VERSION:=release} : ${HOST:=Auto Detect} -REQUIRED_COMMANDS="curl gem" -[ "$VERSION" = "master" ] && - REQUIRED_COMMANDS="$REQUIRED_COMMANDS git" - case $(uname) in Darwin|*BSD|CYGWIN*) sed="sed -E" ;; *) sed="sed -r" ;; @@ -93,15 +89,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..." @@ -277,7 +264,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