YUKI Hiroshi
null+****@clear*****
Mon Sep 29 10:28:40 JST 2014
YUKI Hiroshi 2014-09-29 10:28:40 +0900 (Mon, 29 Sep 2014) New Revision: 2f6fd9a3ea0544be17030db5f5b0ff4a1832f40e https://github.com/droonga/droonga-engine/commit/2f6fd9a3ea0544be17030db5f5b0ff4a1832f40e Message: Detect Ubuntu more smartly Modified files: install.sh Modified: install.sh (+4 -9) =================================================================== --- install.sh 2014-09-29 10:27:35 +0900 (a02a826) +++ install.sh 2014-09-29 10:28:40 +0900 (b852f92) @@ -58,13 +58,8 @@ ensure_root() { guess_platform() { if [ -e /etc/debian_version ] || [ -e /etc/debian_release ]; then -# if lsb_release -i | grep --quiet Ubuntu; then -# echo "ubuntu" -# return 0 -# elif lsb_release -i | grep --quiet Debian; then - echo "debian" - return 0 -# fi + echo "debian" + return 0 elif [ -e /etc/centos-release ]; then echo "centos" return 0 @@ -234,10 +229,10 @@ install_master() { # ====================== for Debian/Ubuntu ========================== prepare_environment_in_debian() { local use_libgroonga_dev=no - if lsb_release -i | grep --quiet Ubuntu; then + if [ "$(lsb_release -i -s)" = "Ubuntu" ]; then add-apt-repository -y ppa:groonga/ppa use_libgroonga_dev=yes - elif lsb_release -i | grep --quiet Debian; then + else local groonga_list=/etc/apt/sources.list.d/groonga.list echo "deb http://packages.groonga.org/debian/ wheezy main" >> $groonga_list echo "deb-src http://packages.groonga.org/debian/ wheezy main" >> $groonga_list -------------- next part -------------- HTML����������������������������...Download