commit: b44b57129fc4a828e8bf36a34ffe3f078f861b2a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 10:58:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
