From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD0581395E2 for ; Mon, 28 Nov 2016 22:19:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BD0BE0850; Mon, 28 Nov 2016 22:19:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0559DE0850 for ; Mon, 28 Nov 2016 22:19:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D23663414C1 for ; Mon, 28 Nov 2016 22:19:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E50FA249C for ; Mon, 28 Nov 2016 22:19:50 +0000 (UTC) From: "Austin English" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Austin English" Message-ID: <1480361242.3c3ba13a37b10d693a622ff974223401df5698da.wizardedit@gentoo> Subject: [gentoo-commits] proj/eselect-java:master commit in: src/scripts/ X-VCS-Repository: proj/eselect-java X-VCS-Files: src/scripts/run-java-tool.bash.in X-VCS-Directories: src/scripts/ X-VCS-Committer: wizardedit X-VCS-Committer-Name: Austin English X-VCS-Revision: 3c3ba13a37b10d693a622ff974223401df5698da X-VCS-Branch: master Date: Mon, 28 Nov 2016 22:19:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 22cdd383-2512-4b66-ad9a-b946d7c37205 X-Archives-Hash: fe95b91597ede7c35b3878f950021a61 commit: 3c3ba13a37b10d693a622ff974223401df5698da Author: Austin English gentoo org> AuthorDate: Mon Nov 28 19:26:49 2016 +0000 Commit: Austin English gentoo 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" "${tool} is not available for ${vm_handle} Gentoo Java User Guide" fi