diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-01-14 14:20:20 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-14 19:01:27 +0000 |
| commit | 60e32b6eb35f4ac5a7ced5b76a19d3d80e6e8e2d (patch) | |
| tree | ef2f15911add432b615cdef0b2ea31a69ce85824 /.gitlab-ci.yml | |
| parent | e5f7f15b1f43f02e07e550596a6ccd47c5291a6f (diff) | |
RPM: remove dependency on the which utility
It is not necessary to know the full path to a program. Instead use the
'type' shell builtin (part of POSIX) to detect availability.
Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80
Reviewed-on: https://code.wireshark.org/review/31540
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70a1195b7f..6efbb9bc5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,6 @@ rpm-centos-7: image: centos:7 script: - yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - - yum install -y which - tools/rpm-setup.sh --install-optional -y - mkdir build - cd build @@ -86,7 +85,7 @@ rpm-centos-7: rpm-opensuse-42.3: image: opensuse:42.3 script: - - zypper --non-interactive install which update-desktop-files + - zypper --non-interactive install update-desktop-files - tools/rpm-setup.sh --install-optional ruby - gem install asciidoctor - mkdir build @@ -98,7 +97,6 @@ rpm-fedora-28: image: fedora:28 script: - dnf upgrade -y - - dnf install -y which - tools/rpm-setup.sh --install-optional -y - mkdir build - cd build |