2
0
mirror of https://github.com/koreader/koreader synced 2024-11-11 19:11:14 +00:00
Commit Graph

23 Commits

Author SHA1 Message Date
Frans de Jonge
475ee28173 Fix KOReader exit
Should reboot less unnecessarily for older versions of KSM, and hopefully this would also be more forward-compatible.
2015-06-19 19:54:41 +02:00
NiLuJe
02fcb9037b 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.
2015-04-28 21:07:25 +02:00
NiLuJe
9f89fc8e47 Fix Kobo startup script w/ KSM
pkill probably only checks the actual name of the binary.
We were checking a shell script, which I'm guessing is not launched
via a shebang, so that name was actually an arg to sh, or something like
that.

Use pidof instead, which matches the full command line.
2015-04-27 22:37:54 +02:00
NiLuJe
a99359fa44 Add a comment to explicit the KSM check 2015-04-27 02:33:31 +02:00
NiLuJe
7fd45c6cd3 And even more Kobo startup script tweaks.
Good news: restarting nickel doesn't deadlock anymore. Yay.
2015-04-27 01:59:50 +02:00
NiLuJe
f259ec4259 Wipe dead code 2015-04-27 01:22:10 +02:00
NiLuJe
7db252a27e More Kobo startup scripts tweaks... 2015-04-27 01:21:54 +02:00
NiLuJe
476ae3322c sync before killing nickel
Hopefully good enough to avoid trashing the DB
2015-04-26 23:42:59 +02:00
NiLuJe
97ad4afa92 Minor comment tweak 2015-04-26 22:54:44 +02:00
NiLuJe
6c1681b595 Well, go for the lesser evil.
For some unknowable reason, restarting nickel on exit deadlocks on my
H2O, so, do a full reboot instead, at least *that* works.
I'm probably one of the only people running KO manually anyway...
2015-04-26 22:46:16 +02:00
NiLuJe
c2bd85bba4 More Kobo scripts tweak...
Trying to figure out why nickel deadlocks on restart...
2015-04-26 22:09:14 +02:00
NiLuJe
1945873682 Tweak the comment a bit 2015-04-26 20:51:35 +02:00
NiLuJe
6f815e2bdf Minor pass of cleanup of the Kobo scripts.
re #1503
2015-04-26 20:46:30 +02:00
HW
de9f1a281d Merge pull request #1499 from Markismus/master
Update koreader.sh
2015-04-22 12:28:52 +02:00
Markismus
1e9996f475 Update koreader.sh
Compatibility with KSM is resolved. Koreader will now work from any directory it is installed in.

KSM7 tweaks `koreader.sh` line 5 from a hardcoded path to the line used above. I've added the change in line 12 to allow OTA updating.
2015-04-22 12:17:17 +02:00
chrox
bb164c1deb Load our own shared libraries if possible
This should fix #1482.
2015-04-13 10:54:32 +08:00
Huang Xin
b56c01c382 Merge pull request #1423 from Markismus/master
Update networkmgr.lua
2015-02-10 23:13:00 +08:00
Markismus
6e95673d80 Update koreader.sh
Forgot the export PLATFORM
2015-02-09 16:19:27 +01:00
Markismus
40202fbc6b Update koreader.sh
The commands in networkmgr.lua rely on an assigned value of PLATFORM. As discussed in #1423 this is only the case for child processes of rcS. This seems to be a fine place to check the value of PLATFORM.
2015-02-09 16:13:07 +01:00
chrox
a40c172c47 fix mupdf rendering caused by FONTDIR env var
It turns out that one of our mupdf patch reads the FONTDIR env var
and uses it in a totally different way so we will use another env var
EXT_FONT_DIR to define external font directory for different platforms.
2015-01-28 02:20:45 +08:00
chrox
077517be0b add FONTDIR env variable
to support custom font directory for EPUB documents

Now Koreader could find fonts in the "fonts" directory in the USB root
directory of kindle, Kobo and PocketBook devices, thus no need to copy
fonts to "koreader/fonts" directory.
2015-01-25 16:52:04 +08:00
chrox
46963df0bb don't need to rebuild ota installed package if it's detected 2014-10-14 21:34:56 +08:00
chrox
2d3c502948 move platform dependent files into 'platform' directory 2014-10-03 18:02:50 +08:00