File tree Expand file tree Collapse file tree 6 files changed +7
-9
lines changed Expand file tree Collapse file tree 6 files changed +7
-9
lines changed Original file line number Diff line number Diff line change 1414 image : registry.fedoraproject.org/fedora:latest
1515 steps :
1616 - name : Install tools
17- run : sudo dnf -y install git make ruff xz clang-tools-extra which codespell git-clang-format ShellCheck
17+ run : sudo dnf -y install git make ruff xz clang-tools-extra codespell git-clang-format ShellCheck
1818
1919 - uses : actions/checkout@v4
2020
Original file line number Diff line number Diff line change @@ -489,7 +489,7 @@ lint: ruff shellcheck codespell
489489 ! git --no-pager grep -E ' \s+$$' \* .c \* .h
490490.PHONY : lint ruff shellcheck codespell
491491
492- codecov : SHELL := $(shell which bash)
492+ codecov : SHELL := $(shell command -v bash)
493493codecov :
494494 curl -Os https://uploader.codecov.io/latest/linux/codecov
495495 chmod +x codecov
Original file line number Diff line number Diff line change @@ -37,5 +37,4 @@ dnf install -y \
3737 python3-setuptools \
3838 python3-wheel \
3939 rubygem-asciidoctor \
40- which \
4140 xmlto
Original file line number Diff line number Diff line change @@ -418,7 +418,7 @@ resolve_path() {
418418 local p
419419
420420 p=" ${2} "
421- if which realpath > /dev/null; then
421+ if command -v realpath > /dev/null; then
422422 p=$( realpath " ${p} " )
423423 fi
424424 ${ECHO} " ${1} : ${p} "
@@ -427,7 +427,7 @@ resolve_path() {
427427resolve_cmd () {
428428 local cpath
429429
430- cpath=$( which " ${2} " )
430+ cpath=$( command -v " ${2} " )
431431 resolve_path " ${1} " " ${cpath} "
432432}
433433
Original file line number Diff line number Diff line change @@ -15,8 +15,7 @@ dnf install -y \
1515 python-unversioned-command \
1616 redhat-rpm-config \
1717 sudo \
18- tar \
19- which
18+ tar
2019
2120# /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
2221chmod 1777 /tmp
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ MAKE := make
2323MKDIR := mkdir -p
2424AWK := awk
2525PERL := perl
26- FULL_PYTHON := $(shell which python3 2>/dev/null)
26+ FULL_PYTHON := $(shell command -v python3 2>/dev/null)
2727PYTHON ?= $(shell basename $(FULL_PYTHON ) )
2828FIND := find
2929SH := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -36,7 +36,7 @@ CTAGS := ctags
3636export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
3737export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
3838
39- export USE_ASCIIDOCTOR ?= $(shell which asciidoctor 2>/dev/null)
39+ export USE_ASCIIDOCTOR ?= $(shell command -v asciidoctor 2>/dev/null)
4040
4141#
4242# Footer.
You can’t perform that action at this time.
0 commit comments