YUKI Hiroshi
null+****@clear*****
Thu Sep 4 19:40:56 JST 2014
YUKI Hiroshi 2014-09-04 19:40:56 +0900 (Thu, 04 Sep 2014) New Revision: 08e8610fb9fc6e922680806d37a289db979337fc https://github.com/droonga/droonga-engine/commit/08e8610fb9fc6e922680806d37a289db979337fc Message: Extract common part to prepare the user Modified files: script/install-master.sh script/install.sh Modified: script/install-master.sh (+6 -4) =================================================================== --- script/install-master.sh 2014-09-04 19:38:49 +0900 (6475646) +++ script/install-master.sh 2014-09-04 19:40:56 +0900 (20b0f74) @@ -21,6 +21,10 @@ exist_user() { grep "^$1:" /etc/passwd > /dev/null } +prepare_user() { + exist_user $USER || useradd -m $USER +} + setup_configuration_directory() { PLATFORM=$1 @@ -68,8 +72,7 @@ install_in_debian() { apt-get install -y ruby ruby-dev build-essential git install_master - # prepare the user - exist_user $USER || useradd -m $USER + prepare_user setup_configuration_directory debian @@ -84,8 +87,7 @@ install_in_centos() { yum -y install ruby-devel git install_master - # prepare the user - exist_user $USER || useradd -m $USER + prepare_user setup_configuration_directory centos Modified: script/install.sh (+6 -4) =================================================================== --- script/install.sh 2014-09-04 19:38:49 +0900 (134f4ac) +++ script/install.sh 2014-09-04 19:40:56 +0900 (3b93372) @@ -21,6 +21,10 @@ exist_user() { grep "^$1:" /etc/passwd > /dev/null } +prepare_user() { + exist_user $USER || useradd -m $USER +} + setup_configuration_directory() { PLATFORM=$1 @@ -50,8 +54,7 @@ install_in_debian() { apt-get install -y ruby ruby-dev build-essential gem install droonga-engine --no-rdoc --no-ri - # prepare the user - exist_user $USER || useradd -m $USER + prepare_user setup_configuration_directory debian @@ -66,8 +69,7 @@ install_in_centos() { yum -y install ruby-devel gem install droonga-engine --no-rdoc --no-ri - # prepare the user - exist_user $USER || useradd -m $USER + prepare_user setup_configuration_directory centos -------------- next part -------------- HTML����������������������������...Download