From bb25edc09ef6cad619d431acc2fa92fb4509882c Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 3 Aug 2018 04:25:00 +0800 Subject: [PATCH] Use own busybox for get_outfd --- scripts/util_functions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 96cb56037..34a4faf21 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -23,6 +23,10 @@ BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK com.top BOOTSIGNED=false get_outfd() { + $BOOTMODE && return + # Preserve environment varibles + OLD_PATH=$PATH + setup_bb if [ -z $OUTFD ] || readlink /proc/$$/fd/$OUTFD | grep -q /tmp; then # We will have to manually find out OUTFD for FD in `ls /proc/$$/fd`; do @@ -323,9 +327,6 @@ boot_actions() { recovery_actions() { # TWRP bug fix mount -o bind /dev/urandom /dev/random - # Preserve environment varibles - OLD_PATH=$PATH - setup_bb # Temporarily block out all custom recovery binaries/libs mv /sbin /sbin_tmp # Unset library paths