v2.5.0 & magisk >= 17.0

This commit is contained in:
Affif Mukhlashin 2018-09-13 12:02:36 +07:00
parent abcf624507
commit 6fb70f63ff
4 changed files with 20 additions and 19 deletions

View File

@ -6,13 +6,10 @@
# #
########################################################################################## ##########################################################################################
# Detect whether in boot mode
ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
$BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true
TMPDIR=/dev/tmp TMPDIR=/dev/tmp
INSTALLER=$TMPDIR/install INSTALLER=$TMPDIR/install
MAGISKBIN=/data/adb/magisk # Always mount under tmp
MOUNTPATH=$TMPDIR/magisk_img
# Default permissions # Default permissions
umask 022 umask 022
@ -26,7 +23,7 @@ ui_print() { echo "$1"; }
require_new_magisk() { require_new_magisk() {
ui_print "*******************************" ui_print "*******************************"
ui_print " Please install Magisk v15.0+! " ui_print " Please install Magisk v17.0+! "
ui_print "*******************************" ui_print "*******************************"
exit 1 exit 1
} }
@ -40,18 +37,21 @@ ZIP=$3
mount /data 2>/dev/null mount /data 2>/dev/null
# Utility functions must exist # Load utility functions
[ -f $MAGISKBIN/util_functions.sh ] || require_new_magisk if [ -f /data/adb/magisk/util_functions.sh ]; then
# Load utility fuctions . /data/adb/magisk/util_functions.sh
. $MAGISKBIN/util_functions.sh elif [ -f /data/magisk/util_functions.sh ]; then
NVBASE=/data
. /data/magisk/util_functions.sh
else
require_new_magisk
fi
# We can't alter magisk image live, use alternative image if required # Use alternative image if in BOOTMODE
$BOOTMODE && IMG=/data/adb/magisk_merge.img $BOOTMODE && IMG=$NVBASE/magisk_merge.img
# Always mount under tmp
MOUNTPATH=$TMPDIR/magisk_img
# Preperation for flashable zips # Preperation for flashable zips
get_outfd setup_flashable
# Mount partitions # Mount partitions
mount_partitions mount_partitions

0
META-INF/com/google/android/updater-script Executable file → Normal file
View File

View File

@ -36,7 +36,8 @@ Just flash and forget.
## Changelog ## Changelog
### v2.5.0 ### v2.5.0
- Update binary files to 2.0.16 - Update binary files to 2.0.16
- add exception for cloudflare fallback resolver. - Add exception for cloudflare fallback resolver.
- Update Magisk Module Template 17000
### v2.4.0 ### v2.4.0
- Update binary files to 2.0.14 - Update binary files to 2.0.14
### v2.3.0 ### v2.3.0

View File

@ -1,7 +1,7 @@
id=dnscrypt-proxy id=dnscrypt-proxy
name=DNSCrypt-Proxy 2 name=DNSCrypt-Proxy 2
version=v2.4.0 version=v2.5.0
versionCode=13 versionCode=14
author=bluemeda author=bluemeda
description=A flexible DNS proxy, with support for modern encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP/2. description=A flexible DNS proxy, with support for modern encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP/2.
minMagisk=1500 minMagisk=1700