From: Josh Durgin Date: Wed, 10 Jul 2013 01:15:25 +0000 (-0700) Subject: Fix package detection on centos in bootstrap X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ec7cd9d291a47f3e9ca60c811b2c6ce4e1be34a;p=s3-tests.git Fix package detection on centos in bootstrap Signed-off-by: Josh Durgin --- diff --git a/bootstrap b/bootstrap index 3ad528fe..3d5d48bc 100755 --- a/bootstrap +++ b/bootstrap @@ -1,16 +1,30 @@ #!/bin/sh set -e -for package in python-pip python-virtualenv python-dev libevent-dev; do - if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then - # add a space after old values - missing="${missing:+$missing }$package" +if [-f /etc/debian_version ]; then + for package in python-pip python-virtualenv python-dev libevent-dev; do + if [ "$(dpkg --status -- $package 2>/dev/null|sed -n 's/^Status: //p')" != "install ok installed" ]; then + # add a space after old values + missing="${missing:+$missing }$package" + fi + done + if [ -n "$missing" ]; then + echo "$0: missing required packages, please install them:" 1>&2 + echo " sudo apt-get install $missing" + exit 1 + fi +fi +if [ -f /etc/redhat-release ]; then + for package in python-pip python-virtualenv python-devel libevent-devel; do + if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then + missing="${missing:+$missing }$package" + fi + done + if [ -n "$missing" ]; then + echo "$0: missing required packages, please install them:" 1>&2 + echo " sudo yum install $missing" + exit 1 fi -done -if [ -n "$missing" ]; then - echo "$0: missing required packages, please install them:" 1>&2 - echo "sudo apt-get install $missing" - exit 1 fi virtualenv --no-site-packages --distribute virtualenv