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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C389515800A for ; Thu, 27 Jul 2023 10:58:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1519DE096A; Thu, 27 Jul 2023 10:58:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAAEDE096A for ; Thu, 27 Jul 2023 10:58:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 016E9335C7D for ; Thu, 27 Jul 2023 10:58:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9330ADDD for ; Thu, 27 Jul 2023 10:58:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690455504.b44b57129fc4a828e8bf36a34ffe3f078f861b2a.sam@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b44b57129fc4a828e8bf36a34ffe3f078f861b2a X-VCS-Branch: master Date: Thu, 27 Jul 2023 10:58:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8cc06f1e-6655-42d8-b074-81ae39a0c0db X-Archives-Hash: b207756765f2228b4737fffa0c282aad commit: b44b57129fc4a828e8bf36a34ffe3f078f861b2a Author: Sam James gentoo org> AuthorDate: Thu Jul 27 10:58:12 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 27 10:58:24 2023 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b44b5712 defaults/initrd.scripts: kill off some more `which` stragglers Followup to 04225e090e9936df6c5a9ddd5a3926d13e0001df. Signed-off-by: Sam James gentoo.org> defaults/initrd.scripts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f8cc861..3d00a55 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -2791,16 +2791,16 @@ tuxonice_resume() { if ! grep suspend_noui /proc/cmdline >/dev/null 2>&1 then - which suspend2ui_text >/dev/null 2>&1 && which suspend2ui_text > "${tuxonice_userui_program}" - which tuxoniceui_text >/dev/null 2>&1 && which tuxoniceui_text > "${tuxonice_userui_program}" + command -v suspend2ui_text >/dev/null 2>&1 && command -v suspend2ui_text > "${tuxonice_userui_program}" + command -v tuxoniceui_text >/dev/null 2>&1 && command -v tuxoniceui_text > "${tuxonice_userui_program}" if [ -n "${splash_theme}" ] then ln -s /etc/splash/${splash_theme} /etc/splash/suspend2 ln -s /etc/splash/${splash_theme} /etc/splash/tuxonice - which suspend2ui_fbsplash >/dev/null 2>&1 && which suspend2ui_fbsplash > "${tuxonice_userui_program}" - which tuxoniceui_fbsplash >/dev/null 2>&1 && which tuxoniceui_fbsplash > "${tuxonice_userui_program}" + command -v suspend2ui_fbsplash >/dev/null 2>&1 && command -v suspend2ui_fbsplash > "${tuxonice_userui_program}" + command -v tuxoniceui_fbsplash >/dev/null 2>&1 && command -v tuxoniceui_fbsplash > "${tuxonice_userui_program}" fi fi