andreacavalli/Magisk
1
0
Fork 0
forked from MarcoBuster/Magisk
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify flash scripts

Browse Source
This commit is contained in:
topjohnwu 2017-09-05 21:44:22 +08:00
parent 9e9f8ca8f3
commit 50c56f8b50
1 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
scripts/flash_script.sh
View File

@ -92,9 +92,7 @@ fi
# Copy required files # Copy required files
rm -rf $MAGISKBIN 2>/dev/null rm -rf $MAGISKBIN 2>/dev/null
mkdir -p $MAGISKBIN mkdir -p $MAGISKBIN
cp -af $BINDIR/. $COMMONDIR/. $MAGISKBIN cp -af $BINDIR/. $COMMONDIR/. $CHROMEDIR $TMPDIR/bin/busybox $MAGISKBIN
cp -af $CHROMEDIR $MAGISKBIN
cp -af $TMPDIR/bin/busybox $MAGISKBIN/busybox
chmod -R 755 $MAGISKBIN chmod -R 755 $MAGISKBIN
# addon.d # addon.d
@ -105,44 +103,10 @@ if [ -d /system/addon.d ]; then
chmod 755 /system/addon.d/99-magisk.sh chmod 755 /system/addon.d/99-magisk.sh
fi fi
##########################################################################################
# Magisk Image
##########################################################################################
$BOOTMODE && boot_actions || recovery_actions $BOOTMODE && boot_actions || recovery_actions
if (is_mounted /data); then
IMG=/data/magisk.img
else
IMG=/cache/magisk.img
ui_print "- Data unavailable, use cache workaround"
fi
if [ -f $IMG ]; then
ui_print "- $IMG detected!"
else
ui_print "- Creating $IMG"
$MAGISKBIN/magisk --createimg $IMG 64M
fi
if ! is_mounted /magisk; then
ui_print "- Mounting $IMG to /magisk"
MAGISKLOOP=`$MAGISKBIN/magisk --mountimg $IMG /magisk`
fi
is_mounted /magisk || abort "! Magisk image mount failed..."
# Core folders
mkdir -p $COREDIR/props $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
chmod 755 $COREDIR/post-fs-data.d $COREDIR/service.d
chown 0.0 $COREDIR/post-fs-data.d $COREDIR/service.d
# Legacy cleanup
mv $COREDIR/magiskhide/hidelist $COREDIR/hidelist 2>/dev/null
rm -rf $COREDIR/magiskhide $COREDIR/bin
########################################################################################## ##########################################################################################
# Unpack boot # Boot patching
########################################################################################## ##########################################################################################
find_boot_image find_boot_image
@ -163,10 +127,7 @@ cd $MAGISKBIN
# Source the boot patcher # Source the boot patcher
. $COMMONDIR/boot_patch.sh "$BOOTIMAGE" . $COMMONDIR/boot_patch.sh "$BOOTIMAGE"
if [ -f stock_boot* ]; then [ -f stock_boot* ] && rm -f /data/stock_boot* 2>/dev/null
rm -f /data/stock_boot* 2>/dev/null
mv stock_boot* /data
fi
ui_print "- Flashing new boot image" ui_print "- Flashing new boot image"
if [ -L "$BOOTIMAGE" ]; then if [ -L "$BOOTIMAGE" ]; then
@ -178,12 +139,8 @@ rm -f new-boot.img
cd / cd /
if ! $BOOTMODE; then # Cleanups
$MAGISKBIN/magisk --umountimg /magisk $MAGISKLOOP $BOOTMODE || recovery_cleanup
rmdir /magisk
recovery_cleanup
fi
rm -rf $TMPDIR rm -rf $TMPDIR
ui_print "- Done" ui_print "- Done"