RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/ops: run-make-check.sh: fix SUSE support

Browse Source 
Get /usr/bin/which from the right RPM.

Fixes: http://tracker.ceph.com/issues/22875
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2018-02-01 15:53:15 +01:00
parent 0fb78d1533
commit 5200405bf0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
run-make-check.sh
View File

@ -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