Format and bump version

This commit is contained in:
Jim Wu 2020-01-06 20:17:35 +08:00
parent d0c27f9747
commit 669a5b6f1a
2 changed files with 21 additions and 42 deletions

View File

@ -58,38 +58,28 @@ check_old_magisk_device() {
}
check_magisk_version() {
for TARGET in ${MODEL}
do
if [[ "${PROP_MODEL}" == ${TARGET} ]]
then
for TARGET in ${MODEL}; do
if [[ "${PROP_MODEL}" == ${TARGET} ]]; then
DETECTED_DEVICE=true
fi
done
for TARGET in ${DEVICE}
do
if [[ "${PROP_DEVICE}" == ${TARGET} ]]
then
for TARGET in ${DEVICE}; do
if [[ "${PROP_DEVICE}" == ${TARGET} ]]; then
DETECTED_DEVICE=true
fi
done
for TARGET in ${PRODUCT}
do
if [[ "${PROP_PRODUCT}" == ${TARGET} ]]
then
for TARGET in ${PRODUCT}; do
if [[ "${PROP_PRODUCT}" == ${TARGET} ]]; then
DETECTED_DEVICE=true
fi
done
for TARGET in ${BRAND}
do
if [[ "${PROP_BRAND}" == ${TARGET} ]]
then
for TARGET in ${BRAND}; do
if [[ "${PROP_BRAND}" == ${TARGET} ]]; then
DETECTED_DEVICE=true
fi
done
for TARGET in ${MANUFACTURER}
do
if [[ "${PROP_MANUFACTURER}" == ${TARGET} ]]
then
for TARGET in ${MANUFACTURER}; do
if [[ "${PROP_MANUFACTURER}" == ${TARGET} ]]; then
DETECTED_DEVICE=true
fi
done
@ -133,8 +123,7 @@ check_architecture
ui_print "- Extracting module files"
unzip -o "${ZIPFILE}" module.prop post-fs-data.sh system.prop uninstall.sh 'system/*' -d "${MODPATH}" >&2
if [[ "${ARCH}" == "x86" || "${ARCH}" == "x64" ]]
then
if [[ "${ARCH}" == "x86" || "${ARCH}" == "x64" ]]; then
ui_print "- Replacing x86/64 libraries"
unzip -o "${ZIPFILE}" 'system_x86/*' -d "${MODPATH}" >&2
rm -rf "${MODPATH}/system/lib"
@ -144,14 +133,12 @@ then
rm -rf "${MODPATH}/system_x86"
fi
if [[ "${IS64BIT}" = false ]]
then
if [[ "${IS64BIT}" = false ]]; then
ui_print "- Removing 64-bit libraries"
rm -rf "${MODPATH}/system/lib64"
fi
if [[ "${OLD_MAGISK}" = true ]]
then
if [[ "${OLD_MAGISK}" = true ]]; then
ui_print "- Extracting custom sepolicy rule for old Magisk"
unzip -o "${ZIPFILE}" sepolicy.sh -d "${MODPATH}" >&2
else

View File

@ -1,8 +1,7 @@
#!/system/bin/sh
MODDIR=${0%/*}
if [[ -z "${MODDIR}/sepolicy.sh" ]]
then
if [[ -z "${MODDIR}/sepolicy.sh" ]]; then
. ${MODDIR}/sepolicy.sh
fi
@ -37,8 +36,7 @@ XP_INSTALLER=de.robv.android.xposed.installer
PATH_PREFIX_PROT=/data/user_de/0/
PATH_PREFIX_LEGACY=/data/user/0/
if [[ ${ANDROID_SDK} -ge 24 ]]
then
if [[ ${ANDROID_SDK} -ge 24 ]]; then
PATH_PREFIX=${PATH_PREFIX_PROT}
else
PATH_PREFIX=${PATH_PREFIX_LEGACY}
@ -47,14 +45,11 @@ fi
DEFAULT_BASE_PATH=${PATH_PREFIX}${EDXP_INSTALLER}
BASE_PATH=${DEFAULT_BASE_PATH}
if [[ ! -d ${BASE_PATH} ]]
then
if [[ ! -d ${BASE_PATH} ]]; then
BASE_PATH=${PATH_PREFIX}${EDXP_MANAGER}
if [[ ! -d ${BASE_PATH} ]]
then
if [[ ! -d ${BASE_PATH} ]]; then
BASE_PATH=${PATH_PREFIX}${XP_INSTALLER}
if [[ ! -d ${BASE_PATH} ]]
then
if [[ ! -d ${BASE_PATH} ]]; then
BASE_PATH=${DEFAULT_BASE_PATH}
fi
fi
@ -65,8 +60,7 @@ CONF_PATH=${BASE_PATH}/conf
DISABLE_VERBOSE_LOG_FILE=${CONF_PATH}/disable_verbose_log
LOG_VERBOSE=true
if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]]
then
if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]]; then
LOG_VERBOSE=false
fi
@ -77,12 +71,10 @@ start_log_cather () {
START_NEW=$4
LOG_FILE=${LOG_PATH}/${LOG_FILE_NAME}
mkdir -p ${LOG_PATH}
if [[ ${CLEAN_OLD} = true ]]
then
if [[ ${CLEAN_OLD} = true ]]; then
rm -rf ${LOG_FILE}
fi
if [[ ${START_NEW} = false ]]
then
if [[ ${START_NEW} = false ]]; then
return
fi
chmod