From 5200405bf031146ceaebf8b347a1b590c06621ba Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 1 Feb 2018 15:53:15 +0100 Subject: [PATCH] build/ops: run-make-check.sh: fix SUSE support Get /usr/bin/which from the right RPM. Fixes: http://tracker.ceph.com/issues/22875 Signed-off-by: Nathan Cutler --- run-make-check.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 72583a1e84152..3fedeb7618fef 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -30,8 +30,8 @@ function get_processors() { function run() { local install_cmd local which_pkg="which" + source /etc/os-release if test -f /etc/redhat-release ; then - source /etc/os-release if ! type bc > /dev/null 2>&1 ; then echo "Please install bc and re-run." exit 1 @@ -41,13 +41,13 @@ function run() { else install_cmd="yum install -y" fi - else + elif type zypper > /dev/null 2>&1 ; then + install_cmd="zypper --gpg-auto-import-keys --non-interactive install --no-recommends" + elif type apt-get > /dev/null 2>&1 ; then + install_cmd="apt-get install -y" which_pkg="debianutils" fi - type apt-get > /dev/null 2>&1 && install_cmd="apt-get install -y" - type zypper > /dev/null 2>&1 && install_cmd="zypper --gpg-auto-import-keys --non-interactive install" - if ! type sudo > /dev/null 2>&1 ; then echo "Please install sudo and re-run. This script assumes it is running" echo "as a normal user with the ability to run commands as root via sudo." @@ -57,6 +57,7 @@ function run() { $DRY_RUN sudo $install_cmd ccache jq $which_pkg else echo "WARNING: Don't know how to install packages" >&2 + echo "This probably means distribution $ID is not supported by run-make-check.sh" >&2 fi if test -f ./install-deps.sh ; then -- 2.39.5