YUKI Hiroshi
null+****@clear*****
Thu Sep 4 19:38:30 JST 2014
YUKI Hiroshi 2014-09-04 19:38:30 +0900 (Thu, 04 Sep 2014) New Revision: 0056f4b43da212a99e82bc532ba5f9e65a8dafa2 https://github.com/droonga/droonga-engine/commit/0056f4b43da212a99e82bc532ba5f9e65a8dafa2 Message: Extract common part to install service script Modified files: script/install-master.sh script/install.sh Modified: script/install-master.sh (+12 -4) =================================================================== --- script/install-master.sh 2014-09-04 18:58:24 +0900 (2b09f0c) +++ script/install-master.sh 2014-09-04 19:38:30 +0900 (4199723) @@ -51,6 +51,16 @@ install_master() { gem install "pkg/*.gem" --no-ri --no-rdoc } +install_service_script() { + INSTALL_LOCATION=$1 + PLATFORM=$2 + DOWNLOAD_URL=$SCRIPT_URL/$PLATFORM/droonga-engine + if [ ! -e $INSTALL_LOCATION ] + then + curl -o $INSTALL_LOCATION $DOWNLOAD_URL + fi +} + install_in_debian() { apt-get update apt-get -y upgrade @@ -63,8 +73,7 @@ install_in_debian() { setup_configuration_directory debian # register droogna-engine as a service - [ ! -e /etc/init.d/droonga-engine ] && - curl -o /etc/init.d/droonga-engine $SCRIPT_URL/debian/droonga-engine + install_service_script /etc/init.d/droonga-engine debian update-rc.d droonga-engine defaults } @@ -80,8 +89,7 @@ install_in_centos() { setup_configuration_directory centos # register droogna-engine as a service - [ ! -e /etc/rc.d/init.d/droonga-engine ] && - curl -o /etc/rc.d/init.d/droonga-engine $SCRIPT_URL/centos/droonga-engine + install_service_script /etc/rc.d/init.d/droonga-engine centos /sbin/chkconfig --add droonga-engine } Modified: script/install.sh (+12 -4) =================================================================== --- script/install.sh 2014-09-04 18:58:24 +0900 (a5f690e) +++ script/install.sh 2014-09-04 19:38:30 +0900 (fec63dd) @@ -33,6 +33,16 @@ setup_configuration_directory() { chown -R $USER.$USER $DROONGA_BASE_DIR } +install_service_script() { + INSTALL_LOCATION=$1 + PLATFORM=$2 + DOWNLOAD_URL=$SCRIPT_URL/$PLATFORM/droonga-engine + if [ ! -e $INSTALL_LOCATION ] + then + curl -o $INSTALL_LOCATION $DOWNLOAD_URL + fi +} + install_in_debian() { apt-get update apt-get -y upgrade @@ -45,8 +55,7 @@ install_in_debian() { setup_configuration_directory debian # register droogna-engine as a service - [ ! -e /etc/init.d/droonga-engine ] && - curl -o /etc/init.d/droonga-engine $SCRIPT_URL/debian/droonga-engine + install_service_script /etc/init.d/droonga-engine debian update-rc.d droonga-engine defaults } @@ -62,8 +71,7 @@ install_in_centos() { setup_configuration_directory centos # register droogna-engine as a service - [ ! -e /etc/rc.d/init.d/droonga-engine ] && - curl -o /etc/rc.d/init.d/droonga-engine $SCRIPT_URL/centos/droonga-engine + install_service_script /etc/rc.d/init.d/droonga-engine centos /sbin/chkconfig --add droonga-engine } -------------- next part -------------- HTML����������������������������...Descargar
