mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-04-17 01:01:24 +00:00
Proper magisk manual injection support
This commit is contained in:
parent
2a22fa694e
commit
9522255e3a
@ -91,15 +91,14 @@ cpio_mkdir() {
|
|||||||
# Initialization
|
# Initialization
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
|
|
||||||
|
[ -z $1 ] && abort_wrap "This script requires a boot image as a parameter"
|
||||||
|
|
||||||
CWD=`pwd`
|
CWD=`pwd`
|
||||||
cd "`dirname_wrap $1`"
|
cd "`dirname_wrap $1`"
|
||||||
BOOTIMAGE="`pwd`/`basename_wrap $1`"
|
BOOTIMAGE="`pwd`/`basename_wrap $1`"
|
||||||
cd "$CWD"
|
cd "$CWD"
|
||||||
|
|
||||||
if [ -z "$BOOTIMAGE" ]; then
|
[ -e "$BOOTIMAGE" ] || abort_wrap "$BOOTIMAGE does not exist!"
|
||||||
ui_print_wrap "This script requires a boot image as a parameter"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Presets
|
# Presets
|
||||||
[ -z $KEEPVERITY ] && KEEPVERITY=false
|
[ -z $KEEPVERITY ] && KEEPVERITY=false
|
||||||
@ -115,11 +114,11 @@ chmod +x ./*
|
|||||||
##########################################################################################
|
##########################################################################################
|
||||||
# Unpack
|
# Unpack
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
|
CHROMEOS=false
|
||||||
|
|
||||||
ui_print_wrap "- Unpacking boot image"
|
ui_print_wrap "- Unpacking boot image"
|
||||||
./magiskboot --unpack "$BOOTIMAGE"
|
./magiskboot --unpack "$BOOTIMAGE"
|
||||||
|
|
||||||
CHROMEOS=false
|
|
||||||
case $? in
|
case $? in
|
||||||
1 )
|
1 )
|
||||||
abort_wrap "! Unable to unpack boot image"
|
abort_wrap "! Unable to unpack boot image"
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
# EX_ARM, EX_X86, BB_ARM, and BB_X86 should be generated in build.py
|
# EX_ARM, EX_X86, BB_ARM, and BB_X86 should be generated in build.py
|
||||||
TMPDIR=/dev/tmp; INSTALLER=$TMPDIR/install; BBDIR=$TMPDIR/bin
|
[ "$1" = "indep" ] && INDEP=true || INDEP=false
|
||||||
|
$INDEP && TMPDIR=/data/local/tmp || TMPDIR=/dev/tmp
|
||||||
|
INSTALLER=$TMPDIR/install; BBDIR=$TMPDIR/bin
|
||||||
EXBIN=$BBDIR/b64xz; BBBIN=$BBDIR/busybox
|
EXBIN=$BBDIR/b64xz; BBBIN=$BBDIR/busybox
|
||||||
rm -rf $TMPDIR 2>/dev/null; mkdir -p $BBDIR
|
$INDEP || rm -rf $TMPDIR 2>/dev/null;
|
||||||
|
mkdir -p $BBDIR 2>/dev/null
|
||||||
touch $EXBIN $BBBIN; chmod 755 $EXBIN $BBBIN
|
touch $EXBIN $BBBIN; chmod 755 $EXBIN $BBBIN
|
||||||
echo -ne $EX_ARM > $EXBIN
|
echo -ne $EX_ARM > $EXBIN
|
||||||
if $EXBIN --test 2>/dev/null; then
|
if $EXBIN --test 2>/dev/null; then
|
||||||
@ -12,6 +15,11 @@ else
|
|||||||
fi
|
fi
|
||||||
$BBBIN --install -s $TMPDIR/bin
|
$BBBIN --install -s $TMPDIR/bin
|
||||||
export PATH=$BBDIR:$PATH
|
export PATH=$BBDIR:$PATH
|
||||||
mkdir -p $INSTALLER
|
if $INDEP; then
|
||||||
unzip -o "$3" -d $INSTALLER
|
shift
|
||||||
exec sh $INSTALLER/META-INF/com/google/android/updater-script $@
|
exec sh $@
|
||||||
|
else
|
||||||
|
mkdir -p $INSTALLER
|
||||||
|
unzip -o "$3" -d $INSTALLER
|
||||||
|
exec sh $INSTALLER/META-INF/com/google/android/updater-script $@
|
||||||
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user