renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2001 from NiLuJe/master

Browse Source 
Update Kobo startup script for KFMon
This commit is contained in:
Qingping Hou
2016-05-01 18:00:29 -07:00
parent 19c4836166 e90f1018db
commit 21d6eb1a3c
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
platform/kobo/koreader.sh
View File

@@ -36,14 +36,39 @@ if pkill -0 nickel ; then
fi
if [ "${FROM_NICKEL}" == "true" ] ; then
# Siphon a few things from nickel's env...
eval "$(xargs -n 1 -0 < /proc/$(pidof nickel)/environ | grep -e DBUS_SESSION_BUS_ADDRESS -e WIFI_MODULE -e PLATFORM -e WIFI_MODULE_PATH -e INTERFACE -e PRODUCT 2>/dev/null)"
export DBUS_SESSION_BUS_ADDRESS WIFI_MODULE PLATFORM WIFI_MODULE_PATH INTERFACE PRODUCT
# Detect if we were started from KFMon
FROM_KFMON="false"
if pkill -0 kfmon ; then
# That's a start, now check if KFMon truly is our parent...
if [ "$(pidof kfmon)" -eq "${PPID}" ] ; then
FROM_KFMON="true"
fi
fi
if [ "${FROM_KFMON}" == "true" ] ; then
# Siphon nickel's full environment, since KFMon inherits such a minimal one, and that apparently confuses the hell out of Nickel for some reason if we decide to restart it without a reboot...
for env in $(xargs -n 1 -0 < /proc/$(pidof nickel)/environ) ; do
export ${env}
done
else
# Siphon a few things from nickel's env...
eval "$(xargs -n 1 -0 < /proc/$(pidof nickel)/environ | grep -e DBUS_SESSION_BUS_ADDRESS -e WIFI_MODULE -e PLATFORM -e WIFI_MODULE_PATH -e INTERFACE -e PRODUCT 2>/dev/null)"
export DBUS_SESSION_BUS_ADDRESS WIFI_MODULE PLATFORM WIFI_MODULE_PATH INTERFACE PRODUCT
fi
# flush disks, might help avoid trashing nickel's DB...
sync
# Double the fun!
sleep 1
sync
# stop kobo software because it's running
killall nickel hindenburg fmon 2>/dev/null
killall nickel hindenburg sickel fickel fmon 2>/dev/null
# NOTE: Not particularly critical, we should be safe leaving it up, but since we reboot on exit anyway...
# Keep KFMon up for now to make sure it's not doing anything overly stupid we might have overlooked ;).
#if [ "${FROM_KFMON}" == "true" ] ; then
# killall kfmon 2>/dev/null
#fi
fi
# fallback for old fmon (and advboot) users (-> if no args were passed to the sript, start the FM)
@@ -89,8 +114,14 @@ fi
./reader.lua "${args}" > crash.log 2>&1
if [ "${FROM_NICKEL}" == "true" ] ; then
# start kobo software because it was running before koreader
./nickel.sh &
if [ "${FROM_KFMON}" != "true" ] ; then
# start kobo software because it was running before koreader
./nickel.sh &
else
# If we were called from KFMon, just reboot, because there's always a (hopefully slim to nonexistent, now) chance Nickel will get its panties in a serious twist on restore for one reason or another...
# And at best, we'd still restart with broken suspend behavior anyway...
reboot
fi
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 or a KSM-related script is running: