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

Update all hardcode paths in app and script

Browse Source
This commit is contained in:
topjohnwu
2020-04-05 01:27:07 -07:00
parent 47d18bb896
commit 93aedcfeb7
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/util_functions.sh
View File

@ -34,8 +34,10 @@ grep_prop() {
getvar() {
local VARNAME=$1
local VALUE=
VALUE=`grep_prop $VARNAME /sbin/.magisk/config /data/.magisk /cache/.magisk`
local VALUE
local PROPPATH='/data/.magisk /cache/.magisk'
[ -n $MAGISKTMP ] && PROPPATH="$MAGISKTMP/config $PROPPATH"
VALUE=$(grep_prop $VARNAME $PROPPATH)
[ ! -z $VALUE ] && eval $VARNAME=\$VALUE
}
@ -628,7 +630,8 @@ is_legacy_script() {
# Require OUTFD, ZIPFILE to be set
install_module() {
local PERSISTDIR=/sbin/.magisk/mirror/persist
local PERSISTDIR
command -v magisk >/dev/null && PERSISTDIR=$(magisk --path)/mirror/persist
rm -rf $TMPDIR
mkdir -p $TMPDIR
@ -705,7 +708,7 @@ install_module() {
fi
# Copy over custom sepolicy rules
if [ -f $MODPATH/sepolicy.rule -a -e $PERSISTDIR ]; then
if [ -f $MODPATH/sepolicy.rule -a -e "$PERSISTDIR" ]; then
ui_print "- Installing custom sepolicy patch"
PERSISTMOD=$PERSISTDIR/magisk/$MODID
mkdir -p $PERSISTMOD
@ -733,7 +736,6 @@ install_module() {
[ -z $BOOTMODE ] && ps -A 2>/dev/null | grep zygote | grep -qv grep && BOOTMODE=true
[ -z $BOOTMODE ] && BOOTMODE=false
MAGISKTMP=/sbin/.magisk
NVBASE=/data/adb
TMPDIR=/dev/tmp