Format and bump version

edxp-core/template_override/customize.sh

@@ -58,38 +58,28 @@ check_old_magisk_device() {
 }
 
 check_magisk_version() {
-    for TARGET in ${MODEL}
+    for TARGET in ${MODEL}; do
-    do
+        if [[ "${PROP_MODEL}" == ${TARGET} ]]; then
-        if [[ "${PROP_MODEL}" == ${TARGET} ]]
-        then
             DETECTED_DEVICE=true
         fi
     done
-    for TARGET in ${DEVICE}
+    for TARGET in ${DEVICE}; do
-    do
+        if [[ "${PROP_DEVICE}" == ${TARGET} ]]; then
-        if [[ "${PROP_DEVICE}" == ${TARGET} ]]
-        then
             DETECTED_DEVICE=true
         fi
     done
-    for TARGET in ${PRODUCT}
+    for TARGET in ${PRODUCT}; do
-    do
+        if [[ "${PROP_PRODUCT}" == ${TARGET} ]]; then
-        if [[ "${PROP_PRODUCT}" == ${TARGET} ]]
-        then
             DETECTED_DEVICE=true
         fi
     done
-    for TARGET in ${BRAND}
+    for TARGET in ${BRAND}; do
-    do
+        if [[ "${PROP_BRAND}" == ${TARGET} ]]; then
-        if [[ "${PROP_BRAND}" == ${TARGET} ]]
-        then
             DETECTED_DEVICE=true
         fi
     done
-    for TARGET in ${MANUFACTURER}
+    for TARGET in ${MANUFACTURER}; do
-    do
+        if [[ "${PROP_MANUFACTURER}" == ${TARGET} ]]; then
-        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" ]]
+if [[ "${ARCH}" == "x86" || "${ARCH}" == "x64" ]]; then
-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 ]]
+if [[ "${IS64BIT}" = false ]]; then
-then
     ui_print "- Removing 64-bit libraries"
     rm -rf "${MODPATH}/system/lib64"
 fi
 
-if [[ "${OLD_MAGISK}" = true ]]
+if [[ "${OLD_MAGISK}" = true ]]; then
-then
     ui_print "- Extracting custom sepolicy rule for old Magisk"
     unzip -o "${ZIPFILE}" sepolicy.sh -d "${MODPATH}" >&2
 else

edxp-core/template_override/post-fs-data.sh

@@ -1,8 +1,7 @@
 #!/system/bin/sh
 MODDIR=${0%/*}
 
-if [[ -z "${MODDIR}/sepolicy.sh" ]]
+if [[ -z "${MODDIR}/sepolicy.sh" ]]; then
-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 ]]
+if [[ ${ANDROID_SDK} -ge 24 ]]; then
-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} ]]
+if [[ ! -d ${BASE_PATH} ]]; then
-then
     BASE_PATH=${PATH_PREFIX}${EDXP_MANAGER}
-    if [[ ! -d ${BASE_PATH} ]]
+    if [[ ! -d ${BASE_PATH} ]]; then
-    then
         BASE_PATH=${PATH_PREFIX}${XP_INSTALLER}
-        if [[ ! -d ${BASE_PATH} ]]
+        if [[ ! -d ${BASE_PATH} ]]; then
-        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} ]]
+if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]]; then
-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 ]]
+    if [[ ${CLEAN_OLD} = true ]]; then
-    then
         rm -rf ${LOG_FILE}
     fi
-    if [[ ${START_NEW} = false ]]
+    if [[ ${START_NEW} = false ]]; then
-    then
         return
     fi
     chmod