Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix startup scripts.

Browse Source 
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:
NiLuJe 2015-04-28 21:07:25 +02:00
parent 67b8b218e0
commit 02fcb9037b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/kindle/koreader.sh
View File

@ -208,7 +208,7 @@ fi
./reader.lua "$@" 2> crash.log ./reader.lua "$@" 2> crash.log
# clean up our own process tree in case the reader crashed (if needed, to avoid flooding KUAL's 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 . . ." logmsg "Sending a SIGTERM to stray KOreader processes . . ."
killall -TERM reader.lua killall -TERM reader.lua
fi fi

2
platform/kobo/koreader.sh
View File

@ -89,7 +89,7 @@ else
# if we were called from advboot then we must reboot to go to the menu # 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: # 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*. # 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 reboot
fi fi
fi fi