From ef62272df72abc8afef97bf502e6a8c89f4fe170 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 10 Jul 2018 02:44:58 +0800 Subject: [PATCH] Small adjustments to prevent seccomp errors --- scripts/flash_script.sh | 4 ---- scripts/update_binary.sh | 16 +++++----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh index 6fb834bec..005a8ce5f 100644 --- a/scripts/flash_script.sh +++ b/scripts/flash_script.sh @@ -13,10 +13,6 @@ # Preparation ########################################################################################## -# This path should work in any cases -TMPDIR=/dev/tmp - -INSTALLER=$TMPDIR/install COMMONDIR=$INSTALLER/common APK=$COMMONDIR/magisk.apk CHROMEDIR=$INSTALLER/chromeos diff --git a/scripts/update_binary.sh b/scripts/update_binary.sh index 298a76b96..2488a7218 100644 --- a/scripts/update_binary.sh +++ b/scripts/update_binary.sh @@ -1,10 +1,4 @@ # EX_ARM, EX_X86, BB_ARM, and BB_X86 should be generated in build.py -getdir() { - case "$1" in - */*) dir=${1%/*}; [ -z $dir ] && echo "/" || echo $dir ;; - *) echo "." ;; - esac -} extract_bb() { EXBIN=$BBDIR/b64xz; BBBIN=$BBDIR/busybox touch $EXBIN; touch $BBBIN; chmod 755 $EXBIN $BBBIN @@ -29,12 +23,12 @@ case "$1" in extract_bb ;; "indep") - TMPDIR="`getdir "${BASH_SOURCE:-$0}"`"; setup_bb - shift; exec sh "$@" + TMPDIR=.; setup_bb; shift + exec /system/bin/sh "$@" ;; *) - TMPDIR=/dev/tmp; rm -rf $TMPDIR 2>/dev/null; setup_bb - INSTALLER=$TMPDIR/install; mkdir -p $INSTALLER; unzip -o "$3" -d $INSTALLER >&2 - exec sh $INSTALLER/META-INF/com/google/android/updater-script $@ + export TMPDIR=/dev/tmp; rm -rf $TMPDIR 2>/dev/null; setup_bb + export INSTALLER=$TMPDIR/install; mkdir -p $INSTALLER; unzip -o "$3" -d $INSTALLER >&2 + exec sh $INSTALLER/META-INF/com/google/android/updater-script "$@" ;; esac