TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-22 16:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
topjohnwu 2017-03-20 05:03:52 +08:00
parent 9f9333315e
commit 02e039d792
3 changed files with 6 additions and 7 deletions

10
scripts/magic_mask.sh

@ -310,7 +310,7 @@ case $1 in
if [ -f $UNINSTALLER ]; then if [ -f $UNINSTALLER ]; then
touch /dev/.magisk.unblock touch /dev/.magisk.unblock
chcon u:object_r:device:s0 /dev/.magisk.unblock chcon u:object_r:device:s0 /dev/.magisk.unblock
sh $UNINSTALLER BOOTMODE=true sh $UNINSTALLER
exit exit
fi fi
@ -493,10 +493,10 @@ case $1 in
bind_mount $COREDIR/hosts /system/etc/hosts bind_mount $COREDIR/hosts /system/etc/hosts
fi fi
if [ -f /data/magisk/magisk.apk ]; then if [ -f $BINPATH/magisk.apk ]; then
if [ -z `ls /data/app | grep com.topjohnwu.magisk` ]; then if ! ls /data/app | grep com.topjohnwu.magisk; then
mkdir /data/app/com.topjohnwu.magisk-1 mkdir /data/app/com.topjohnwu.magisk-1
cp /data/magisk/magisk.apk /data/app/com.topjohnwu.magisk-1/base.apk cp $BINPATH/magisk.apk /data/app/com.topjohnwu.magisk-1/base.apk
chown 1000.1000 /data/app/com.topjohnwu.magisk-1 chown 1000.1000 /data/app/com.topjohnwu.magisk-1
chown 1000.1000 /data/app/com.topjohnwu.magisk-1/base.apk chown 1000.1000 /data/app/com.topjohnwu.magisk-1/base.apk
chmod 755 /data/app/com.topjohnwu.magisk-1 chmod 755 /data/app/com.topjohnwu.magisk-1
@ -504,7 +504,7 @@ case $1 in
chcon u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1 chcon u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1
chcon u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1/base.apk chcon u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1/base.apk
fi fi
rm -f /data/magisk/magisk.apk 2>/dev/null rm -f $BINPATH/magisk.apk 2>/dev/null
fi fi
# Expose busybox # Expose busybox

3
scripts/magisk_uninstaller.sh

@ -1,5 +1,4 @@
# Detect whether in boot mode [ -z $BOOTMODE ] && BOOTMODE=false
ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
# This path should work in any cases # This path should work in any cases
TMPDIR=/dev/tmp TMPDIR=/dev/tmp

BIN
zip_static/common/magisk.apk

Binary file not shown.