mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 19:18:00 +02:00
contrib/REQUIRED_PACKAGES: fix script to work without GNU which installed
`which` is convenient, but not installed in Fedora container images. Fix detection of whether to use `dnf` or `yum`.
This commit is contained in:
parent
bdd45e6afa
commit
5cc8ca4038
1 changed files with 2 additions and 1 deletions
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
set -xe
|
||||
|
||||
DNF="$(which dnf &>/dev/null && echo dnf || echo yum)"
|
||||
DNF="$( ( which dnf || dnf --version ) &>/dev/null && echo dnf || echo yum)"
|
||||
|
||||
install() {
|
||||
if [ "$NM_INSTALL" != "" ]; then
|
||||
|
|
@ -81,6 +81,7 @@ install \
|
|||
vala-devel \
|
||||
vala-tools \
|
||||
valgrind \
|
||||
which \
|
||||
"${EXTRA_PACKAGES[@]}"
|
||||
|
||||
# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue