Skip to content

Commit 2c17b7d

Browse files
committed
Remove dependency on which
1 parent 086d191 commit 2c17b7d

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
8484
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
8585

8686
test -z "${m2home}" && m2home="${datadir}/xmvn"
87-
test -z "${pyinterpreter}" && pyinterpreter=$(which python)
87+
test -z "${pyinterpreter}" && pyinterpreter=$(type -p python)
8888
test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
8989

9090
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)

java-utils/java-functions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ set_javacmd()
169169
done
170170
fi
171171

172-
JAVACMD=$(which java 2>/dev/null || :)
172+
JAVACMD=$(type -p java 2>/dev/null || :)
173173
if [ -x "${JAVACMD}" ]; then
174174
_log "Using JAVACMD from PATH: $JAVACMD"
175175
else
@@ -324,7 +324,7 @@ find_jar()
324324
{
325325
local IFS=:
326326
local artifact="${1}"
327-
local cmd=$(which xmvn-resolve 2>/dev/null || :)
327+
local cmd=$(type -p xmvn-resolve 2>/dev/null || :)
328328

329329
# If artifact contains semicolon then assume it specifies Maven
330330
# artifact coordinates.

javapackages-tools.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Source: https://github.com/fedora-java/javapackages/archive/%{version}.t
2222
Source21: toolchains-openjdk21.xml
2323

2424
BuildRequires: coreutils
25-
BuildRequires: which
2625
BuildRequires: make
2726
BuildRequires: rubygem-asciidoctor
2827
BuildRequires: %{python_prefix}-devel
@@ -33,7 +32,6 @@ BuildRequires: %{python_prefix}-pytest
3332
Requires: javapackages-filesystem = %{version}-%{release}
3433
Requires: coreutils
3534
Requires: findutils
36-
Requires: which
3735

3836
Provides: jpackage-utils = %{version}-%{release}
3937

0 commit comments

Comments
 (0)