Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect-java:master commit in: src/scripts/
Date: Mon, 28 Nov 2016 22:19:56
Message-Id: 1480361233.4d7da7ac603f610fef687ea95357e7b727b19d03.wizardedit@gentoo
1 commit: 4d7da7ac603f610fef687ea95357e7b727b19d03
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 19:23:43 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 19:27:13 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=4d7da7ac
7
8 src/scripts/run-java-tool.bash.in: replace `which` with `command -v`
9
10 which is an external binary and may not be installed on all systems.
11 command is a shell builtin, and more likely to be available.
12
13 Based on a patch by Manuel RĂ¼ger <mrueg <AT> gentoo.org>
14
15 Gentoo-Bug: https://bugs.gentoo.org/599392
16
17 src/scripts/run-java-tool.bash.in | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/src/scripts/run-java-tool.bash.in b/src/scripts/run-java-tool.bash.in
21 index 2587fee..67e4dba 100644
22 --- a/src/scripts/run-java-tool.bash.in
23 +++ b/src/scripts/run-java-tool.bash.in
24 @@ -26,7 +26,7 @@ toolpath=$(
25 export PATH=
26 . "@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm/${vm_handle}" 2> /dev/null
27 : ${PATH:=${vmpath}/bin:${vmpath}/jre/bin}
28 - "@GENTOO_PORTAGE_EPREFIX@/usr/bin/which" "${tool}" 2> /dev/null
29 + command -v "${tool}" 2> /dev/null
30 )
31
32 if [ -x "${toolpath}" ]; then