CommonAddon: update detect_outfd

merge-requests/23/head
Christopher Roy Bratusek 6 years ago
parent 5141b82932
commit c7f6fda4a6

@ -15,7 +15,6 @@
. /tmp/backuptool.functions
MODID=@MODID@
OUTFD=$(ps | grep -v grep | grep -oE "update(.*)" | cut -d" " -f3)
GOOGLE_APPS="AMAPNetworkLocation
BaiduNetworkLocation
@ -79,6 +78,24 @@ ui_print () {
echo -n -e "ui_print\n" >> /proc/self/fd/${OUTFD}
}
detect_outfd () {
readlink /proc/$$/fd/${OUTFD} 2>/dev/null | grep /tmp >/dev/null
if [ "$?" -eq "0" ]; then
OUTFD=0
for FD in $(ls /proc/$$/fd); do
readlink /proc/$$/fd/${FD} 2>/dev/null | grep pipe >/dev/null
if [ "$?" -eq "0" ]; then
ps | grep " 3 ${FD} " | grep -v grep >/dev/null
if [ "$?" -eq "0" ]; then
OUTFD=${FD}
break
fi
fi
done
fi
}
solve_gappsconflicts () {
for app in ${GOOGLE_APPS}; do
${NANODROID_BINDIR}/nanodroid-overlay --add ${app}
@ -92,6 +109,8 @@ solve_gappsconflicts () {
done
}
detect_outfd
case "${1}" in
backup)
ui_print "${MODID} addon.d: backup"

Loading…
Cancel
Save