From eb3ab39a80d0cd0853a50c8c66d65e7b9a514a10 Mon Sep 17 00:00:00 2001 From: KOWX712 Date: Thu, 31 Oct 2024 22:45:21 +0800 Subject: [PATCH] fix config list issue fix multiple package name in config list when updating module --- module/customize.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/module/customize.sh b/module/customize.sh index f2b41fa..b22105d 100644 --- a/module/customize.sh +++ b/module/customize.sh @@ -1,11 +1,11 @@ SKIPUNZIP=0 DEBUG=false -if [ "$MAGISK_VER_CODE" ]; then - BM="Magisk:$MAGISK_VER│$MAGISK_VER_CODE" +if [ "$APATCH" ]; then + echo "APatch:$APATCH_VER│$APATCH_VER_CODE" elif [ "$KSU" ]; then - BM="KSU:$KSU_KERNEL_VER_CODE│$KSU_VER_CODE" -elif [ "$APATCH" ]; then - BM="APatch:$APATCH_VER│$APATCH_VER_CODE" + echo "KSU:$KSU_KERNEL_VER_CODE│$KSU_VER_CODE" +elif [ "$MAGISK_VER_CODE" ]; then + echo "Magisk:$MAGISK_VER│$MAGISK_VER_CODE" else ui_print " "; ui_print "! recovery is not supported"; @@ -55,20 +55,22 @@ key_check() { } add_exclude() { - for app in $EXCLUDE; do - if ! grep -qx "$app" $COMPATH/EXCLUDE; then - echo "$app" >> $COMPATH/EXCLUDE - fi - done - mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE" + for app in $EXCLUDE; do + app=$(echo "$app" | tr -d '[:space:]') + if ! grep -Fqx "$app" $COMPATH/EXCLUDE; then + echo "$app" >> $COMPATH/EXCLUDE + fi + done + mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE" } add_addition() { - for app in $ADDITION; do - if ! grep -qx "$app" $COMPATH/ADDITION; then - echo "$app" >> $COMPATH/ADDITION - fi - done + for app in $ADDITION; do + app=$(echo "$app" | tr -d '[:space:]') + if ! grep -Fqx "$app" $COMPATH/ADDITION; then + echo "$app" >> $COMPATH/ADDITION + fi + done mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION" }