Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 21:27:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update scripts

Browse Source
This commit is contained in:
topjohnwu
2017-04-22 07:05:10 +08:00
parent 4c96d23f48
commit 623a879797
18 changed files with 21 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/custom_ramdisk_patch.sh
View File

@ -47,11 +47,10 @@ cpio_add 750 init.rc init.rc
# sepolicy patches
cpio_extract sepolicy sepolicy
LD_LIBRARY_PATH=$SYSTEMLIB $MAGISKBIN/magiskpolicy --load sepolicy --save sepolicy --minimal
LD_LIBRARY_PATH=$SYSTEMLIB $MAGISKBIN/magisk magiskpolicy --load sepolicy --save sepolicy --minimal
cpio_add 644 sepolicy sepolicy
# Add new items
cpio_mkdir 755 magisk
cpio_add 750 init.magisk.rc $MAGISKBIN/init.magisk.rc
cpio_add 750 sbin/magic_mask.sh $MAGISKBIN/magic_mask.sh
cpio_add 755 sbin/magisk $MAGISKBIN/magisk

42
scripts/flash_script.sh
View File

@ -190,9 +190,9 @@ cpio_mkdir() {
# Detection
##########################################################################################
ui_print "*****************************"
ui_print "MAGISK_VERSION_STUB"
ui_print "*****************************"
ui_print "************************"
ui_print "* MAGISK_VERSION_STUB"
ui_print "************************"
if [ ! -d "$COMMONDIR" ]; then
ui_print "! Failed: Unable to extract zip file!"
@ -256,36 +256,22 @@ fi
# Environment
##########################################################################################
# TODO: Environment
ui_print "- Constructing environment"
# ui_print "- Constructing environment"
is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
# is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
# Copy required files
rm -rf $MAGISKBIN 2>/dev/null
mkdir -p $MAGISKBIN
cp -af $BINDIR/. $COMMONDIR/magisk.apk $COMMONDIR/init.magisk.rc $COMMONDIR/custom_ramdisk_patch.sh $MAGISKBIN
# # Copy required files
# rm -rf $MAGISKBIN 2>/dev/null
# mkdir -p $MAGISKBIN
# cp -af $BINDIR/busybox $BINDIR/magiskboot $BINDIR/magiskpolicy $COMMONDIR/magisk.apk \
# $COMMONDIR/init.magisk.rc $COMMONDIR/custom_ramdisk_patch.sh $COMMONDIR/magic_mask.sh $MAGISKBIN
# # Legacy support
# ln -sf /data/magisk/magiskpolicy $MAGISKBIN/sepolicy-inject
# chmod -R 755 $MAGISKBIN
# chcon -h u:object_r:system_file:s0 $MAGISKBIN $MAGISKBIN/*
# # Temporary busybox for installation
# rm -rf $TMPDIR/busybox 2>/dev/null
# mkdir -p $TMPDIR/busybox
# $BINDIR/busybox --install -s $TMPDIR/busybox
# rm -f $TMPDIR/busybox/su $TMPDIR/busybox/sh $TMPDIR/busybox/reboot
# PATH=$TMPDIR/busybox:$PATH
chmod -R 755 $MAGISKBIN
chcon -h u:object_r:system_file:s0 $MAGISKBIN $MAGISKBIN/*
##########################################################################################
# Magisk Image
##########################################################################################
# TODO: Magisk Image
# Fix SuperSU.....
$BOOTMODE && $BINDIR/magiskpolicy --live "allow fsck * * *"
@ -311,7 +297,7 @@ fi
MAGISKLOOP=$LOOPDEVICE
# Core folders and scripts
mkdir -p $COREDIR/bin $COREDIR/props $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
mkdir -p $COREDIR/props $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
cp -af $COMMONDIR/magiskhide/. $COREDIR/magiskhide
chmod -R 755 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
@ -450,12 +436,8 @@ else
cpio_add 644 sepolicy sepolicy
# Add new items
cpio_mkdir 755 magisk
[ ! -z $SHA1 ] && echo "# STOCKSHA1=$SHA1" >> $COMMONDIR/init.magisk.rc
cpio_add 750 init.magisk.rc $COMMONDIR/init.magisk.rc
# cpio_add 750 sbin/magic_mask.sh $COMMONDIR/magic_mask.sh
cpio_add 755 sbin/magisk $BINDIR/magisk
# Create ramdisk backups

5
scripts/magisk_uninstaller.sh
View File

@ -44,11 +44,6 @@ find_boot_image() {
# Environments
# Set permissions
chmod -R 755 $CHROMEDIR/futility $MAGISKBIN 2>/dev/null
# Temporary busybox for installation
mkdir -p $TMPDIR/busybox
$MAGISKBIN/busybox --install -s $TMPDIR/busybox
rm -f $TMPDIR/busybox/su $TMPDIR/busybox/sh $TMPDIR/busybox/reboot
PATH=$TMPDIR/busybox:$PATH
# Find the boot image
find_boot_image