mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Fix startup scripts.
Thanks to @Markismus's questions, I realized that some of what i thought
was true, wasn't.
First, pkill is a terrible idea to check for interpreted scripts.
Second, pidof is also potentially not that great for interpreted
scripts, because it'll only work with a shebang, and one that is
following the Linux syntax.
We don't have the full version with the -x to paper over that,
so use pgrep -f instead.
cf.
a736a571d2 (commitcomment-10948910)
for the gory details.
This commit is contained in:
@@ -208,7 +208,7 @@ fi
|
||||
./reader.lua "$@" 2> crash.log
|
||||
|
||||
# clean up our own process tree in case the reader crashed (if needed, to avoid flooding KUAL's log)
|
||||
if pkill -0 reader.lua ; then
|
||||
if pidof reader.lua > /dev/null 2>&1 ; then
|
||||
logmsg "Sending a SIGTERM to stray KOreader processes . . ."
|
||||
killall -TERM reader.lua
|
||||
fi
|
||||
|
||||
@@ -89,7 +89,7 @@ else
|
||||
# if we were called from advboot then we must reboot to go to the menu
|
||||
# NOTE: This is actually achieved by checking if KSM is running:
|
||||
# This might lead to false-positives if you use neither KSM nor advboot to launch KOReader *without nickel running*.
|
||||
if ! pidof ksmhome.sh > /dev/null 2>&1 ; then
|
||||
if ! pgrep -f ksmhome.sh > /dev/null 2>&1 ; then
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user