MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Small adjustments to prevent seccomp errors

Browse Source
This commit is contained in:
topjohnwu 2018-07-10 02:44:58 +08:00
parent 375cd0e42b
commit ef62272df7
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/flash_script.sh
View File

@ -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

16
scripts/update_binary.sh
View File

@ -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