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