Skip to content

Commit

Permalink
Remove dependency on which
Browse files Browse the repository at this point in the history
  • Loading branch information
mizdebsk committed Oct 7, 2024
1 parent 086d191 commit 2c17b7d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"

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

eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)
Expand Down
4 changes: 2 additions & 2 deletions java-utils/java-functions
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ set_javacmd()
done
fi

JAVACMD=$(which java 2>/dev/null || :)
JAVACMD=$(type -p java 2>/dev/null || :)
if [ -x "${JAVACMD}" ]; then
_log "Using JAVACMD from PATH: $JAVACMD"
else
Expand Down Expand Up @@ -324,7 +324,7 @@ find_jar()
{
local IFS=:
local artifact="${1}"
local cmd=$(which xmvn-resolve 2>/dev/null || :)
local cmd=$(type -p xmvn-resolve 2>/dev/null || :)

# If artifact contains semicolon then assume it specifies Maven
# artifact coordinates.
Expand Down
2 changes: 0 additions & 2 deletions javapackages-tools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Source: https://github.com/fedora-java/javapackages/archive/%{version}.t
Source21: toolchains-openjdk21.xml

BuildRequires: coreutils
BuildRequires: which
BuildRequires: make
BuildRequires: rubygem-asciidoctor
BuildRequires: %{python_prefix}-devel
Expand All @@ -33,7 +32,6 @@ BuildRequires: %{python_prefix}-pytest
Requires: javapackages-filesystem = %{version}-%{release}
Requires: coreutils
Requires: findutils
Requires: which

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

Expand Down

0 comments on commit 2c17b7d

Please sign in to comment.