HAYASHI Kentaro
null+****@clear*****
Tue Aug 21 14:17:01 JST 2012
HAYASHI Kentaro 2012-08-21 14:17:01 +0900 (Tue, 21 Aug 2012) New Revision: 1f5ba61976c662b8038e4082d0c008f81bb36220 https://github.com/groonga/groonga/commit/1f5ba61976c662b8038e4082d0c008f81bb36220 Log: apt yum: make 'check-install' option more flexible Modified files: packages/check-utility.sh Modified: packages/check-utility.sh (+12 -4) =================================================================== --- packages/check-utility.sh 2012-08-21 13:16:56 +0900 (f0c2e41) +++ packages/check-utility.sh 2012-08-21 14:17:01 +0900 (bcd28de) @@ -11,6 +11,7 @@ CHROOT_ROOT=/var/lib/chroot CHECK_ADDRESS=0 CHECK_INSTALL=0 +CHECK_INSTALL_PACKAGE=groonga ENABLE_REPOSITORY=0 DISABLE_REPOSITORY=0 INSTALL_SCRIPT=0 @@ -95,13 +96,11 @@ check_installed_groonga_packages () { cat > check-deb-groonga.sh <<EOF #!/bin/sh -dpkg -l | grep roonga -dpkg -l | grep mysql +dpkg -l | grep $CHECK_INSTALL_PACKAGE EOF cat > check-rpm-groonga.sh <<EOF #!/bin/sh -rpm -qa | grep roonga -rpm -qa | grep mysql +rpm -qa | grep $CHECK_INSTALL_PACKAGE EOF for code in $CODES; do for arch in $DEB_ARCHITECTURES; do @@ -380,6 +379,15 @@ while [ $# -ne 0 ]; do --check-install) CHECK_INSTALL=1 shift + if [ ! -z "$1" ]; then + case $1 in + groonga|mroonga|roonga|mecab) + CHECK_INSTALL_PACKAGE=$1 + ;; + *) + ;; + esac + fi ;; --check-address) CHECK_ADDRESS=1 -------------- next part -------------- HTML����������������������������...Download