From c7f6fda4a61d9aca5248be30f580c7d0cd9fb5d5 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sat, 8 Sep 2018 19:21:36 +0200
Subject: [PATCH] CommonAddon: update detect_outfd

---
 CommonAddon | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/CommonAddon b/CommonAddon
index b594b3f..525d847 100644
--- a/CommonAddon
+++ b/CommonAddon
@@ -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"