| 1 |
commit: 3c3ba13a37b10d693a622ff974223401df5698da |
| 2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 19:26:49 2016 +0000 |
| 4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 19:27:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=3c3ba13a |
| 7 |
|
| 8 |
src/scripts/run-java-tool.bash.in: fix shellcheck issues |
| 9 |
|
| 10 |
src/scripts/run-java-tool.bash.in | 3 ++- |
| 11 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/src/scripts/run-java-tool.bash.in b/src/scripts/run-java-tool.bash.in |
| 14 |
index 67e4dba..9c57fe8 100644 |
| 15 |
--- a/src/scripts/run-java-tool.bash.in |
| 16 |
+++ b/src/scripts/run-java-tool.bash.in |
| 17 |
@@ -24,6 +24,7 @@ vm_handle=${vmpath##*/} |
| 18 |
|
| 19 |
toolpath=$( |
| 20 |
export PATH= |
| 21 |
+ # shellcheck disable=SC1090 |
| 22 |
. "@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm/${vm_handle}" 2> /dev/null |
| 23 |
: ${PATH:=${vmpath}/bin:${vmpath}/jre/bin} |
| 24 |
command -v "${tool}" 2> /dev/null |
| 25 |
@@ -48,7 +49,7 @@ else |
| 26 |
else |
| 27 |
echo "* ${tool} is not available for ${vm_handle} on $(uname -m)" >&2 |
| 28 |
echo "* IMPORTANT: some Java tools are not available on some VMs on some architectures" >&2 |
| 29 |
- if [ "$(id -u)" != 0 ] && [ -n "${DISPLAY}" ] && type notify-send > /dev/null; then |
| 30 |
+ if [ "$(id -u)" != 0 ] && [ -n "${DISPLAY}" ] && command -v notify-send > /dev/null; then |
| 31 |
notify-send -i java-icon48 "Gentoo Java Launcher" "<b>${tool}</b> is not available for ${vm_handle} |
| 32 |
<a href=\"https://wiki.gentoo.org/wiki/Java\">Gentoo Java User Guide</a>" |
| 33 |
fi |
Archives