From 304d3939492dc9af9e2e4292f973d2a7a1189bca Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sat, 12 Nov 2022 17:44:11 +0100 Subject: [PATCH] Kobo: Unbreak KSM detection There isn't actually a kbmenu binary, the process names are all shell scripts, kbmenu just happens to be the default folder name, so we need full commandline matching ;). Fix https://github.com/koreader/koreader/pull/9738#issuecomment-1312473323 Regression since #9738 Bump base https://github.com/koreader/koreader-base/pull/1552 --- base | 2 +- platform/kobo/koreader.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base b/base index c1d97b47a..b6bd3386a 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit c1d97b47abeca6eccd0c136e31749302cc84212f +Subproject commit b6bd3386aaaa2dbe3821ddd6ed901813ac80aff9 diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh index 31ff1b9b2..662f4cd61 100755 --- a/platform/kobo/koreader.sh +++ b/platform/kobo/koreader.sh @@ -611,13 +611,13 @@ if [ ${RETURN_VALUE} -ne ${KO_RC_HALT} ]; then # if we were called from advboot then we must reboot to go to the menu # NOTE: This is actually achieved by checking if KSM or a KSM-related script is running: # This might lead to false-positives if you use neither KSM nor advboot to launch KOReader *without nickel running*. - if ! pkill -0 kbmenu; then + if ! pkill -0 -f kbmenu; then /sbin/reboot fi fi else if [ "${VIA_NICKEL}" = "false" ]; then - if pkill -0 kbmenu; then + if pkill -0 -f kbmenu; then # If we were started by KSM and requested an exit, attempt to *NOT* exit the script, # so as not to re-enter KSM at all, to make sure the device powers off with our own ScreenSaver displayed. # NOTE: This might not be fool-proof, as a poweroff might take longer than that,