fix recognition issue

changelog.md

@@ -8,6 +8,10 @@ GitHub release: https://github.com/KOWX712/Tricky-Addon-Update-Target-List/relea
 Telegram channel: https://t.me/kowchannel
 
 ## Changelog
+### v1.3.1
+- Added Apatch Next package name to exclude list
+- Fix automatic update target script not working issue
+
 ### v1.3
 - Minor improvement in code
 - Overwrite protection: won't remove previous setup when updating module

lite-script_only/README.md

@@ -3,6 +3,9 @@
 - Run with root priviledge
 
 ## Changelog
+### v1.3.1
+- Added Apatch Next package name to exclude list
+
 ### v1.3
 - More user friendly exclude and addition list config
 

lite-script_only/UpdateTargetList.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # by KOW
-# Tricky Addon Lite: Update Target List Script v1.3
+# Tricky Addon Lite: Update Target List Script v1.3.1
 # GitHub Repository: https://github.com/KOWX712/Tricky-Addon-Update-Target-List/blob/master/lite-script_only/README.md
 # Telegram channel: https://t.me/kowchannel
 
@@ -13,7 +13,8 @@ EXCLUDE="
 oneplus
 coloros
 com.android.patch
-me.bmax.apatch"
+me.bmax.apatch
+me.garfieldhan.apatch.next"
 
 ADDITION="
 com.google.android.gms

module/common/ADDITION

@@ -6,4 +6,4 @@
 com.google.android.gms
 io.github.vvb2060.keyattestation
 io.github.vvb2060.mahoshojo
-icu.nullptr.nativetest
+icu.nullptr.nativetest

module/common/EXCLUDE

@@ -6,4 +6,5 @@
 oneplus
 coloros
 com.android.patch
-me.bmax.apatch
+me.bmax.apatch
+me.garfieldhan.apatch.next

module/common/UpdateTargetList.sh

@@ -26,7 +26,7 @@ fi
 
 # Read exclution and addition config
 EXCLUDE=$(grep -vE '^#|^$' "$MODDIR/EXCLUDE" | tr '\n' '|' | sed 's/|$//')
-ADDITION=$(grep -vE '^#|^$' "$MODDIR/ADDITION")
+ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$MODDIR/ADDITION")
 
 # Create or overwrite the target.txt file
 echo "- Overwritting target.txt"

module/customize.sh

@@ -51,6 +51,27 @@ COMPATH="$MODPATH/common"
 CONFIG_DIR="/data/adb/tricky_store/target_list_config"
 SCRIPT_DIR="/data/adb/tricky_store"
 MODNAME=$(grep '^id=' "$MODPATH/module.prop" | awk -F= '{print $2}' | xargs)
+
+add_exclude() {
+  EXCLUDE=$(grep -vE '^#|^$' "$CONFIG_DIR/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"
+}
+
+add_addition() {
+  ADDITION=$(grep -vE '^#|^$' "$CONFIG_DIR/ADDITION")
+  for app in $ADDITION; do
+      if ! grep -qx "$app" $COMPATH/ADDITION; then
+          echo "$app" >> $COMPATH/ADDITION
+      fi
+  done
+  mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
+}
+
 for status in normal ninstalled disabled; do
     cp "$MODPATH/module.prop" "$COMPATH/$status"
 done
@@ -58,6 +79,7 @@ sed -i 's/^description=.*/description=Tricky store is not installed/' "$COMPATH/
 sed -i 's/^description=.*/description=Tricky store is disabled/' "$COMPATH/disabled"
 rm -f "$SCRIPT_DIR/UpdateTargetList.sh"
 cp "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh"
+
 if [ ! -d "$CONFIG_DIR" ]; then
     mkdir -p "$CONFIG_DIR"
     mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
@@ -68,13 +90,13 @@ elif [ -d "$CONFIG_DIR" ]; then
         mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
     elif [ ! -f "$CONFIG_DIR/ADDITION" ]; then
         mv "$COMPATH/ADDITION" "$CONFIG_DIR/ADDITION"
-        rm -f "$COMPATH/EXCLUDE"
+        add_exclude
     elif [ ! -f "$CONFIG_DIR/EXCLUDE" ]; then
         mv "$COMPATH/EXCLUDE" "$CONFIG_DIR/EXCLUDE"
-        rm -f "$COMPATH/ADDITION"
+        add_addition
     else
-        rm -f "$COMPATH/EXCLUDE"
+        add_exclude
-        rm -f "$COMPATH/ADDITION"
+        add_addition
     fi
 fi
 

module/module.prop

@@ -1,7 +1,7 @@
 id=TA_utl
 name=Tricky Addon: Update Target List
-version=v1.3
+version=v1.3.1
-versionCode=13
+versionCode=131
 author=KOWX712
 description=Update tricky store target list with action button. Custom config: ADDITION and EXCLUDE in /data/adb/tricky_store/target_list_config
 updateJson=https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/refs/heads/master/update.json

module/service.sh

@@ -4,7 +4,7 @@ TS="/data/adb/modules/tricky_store"
 
 if [ ! -f "$COMPATH/ninstalled" ] || [ ! -f "$COMPATH/disabled" ] || [ ! -f "$COMPATH/normal" ]; then
     sed -i 's/^description=.*/description=Module is corrupted, please reinstall module./' "$MODDIR/module.prop"
-    abort
+    exit 1
 fi
 
 if [ ! -d "$TS" ]; then
@@ -16,5 +16,5 @@ else
     until [ "$(getprop sys.boot_completed)" = "1" ]; do
         sleep 1
     done
-    . "$COMPATH/common/UpdateTargetList.sh"
+    . "$COMPATH/UpdateTargetList.sh"
 fi

update.json

@@ -1,6 +1,6 @@
 {
-  "version": "v1.2",
+  "version": "v1.3",
-  "versionCode": 12,
+  "versionCode": 13,
-  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v1.2/TrickyAddonModule_UpdateTargetList-v1.2.zip",
+  "zipUrl": "https://github.com/KOWX712/Tricky-Addon-Update-Target-List/releases/download/v1.3/TrickyAddonModule_UpdateTargetList-v1.3.zip",
   "changelog": "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/refs/heads/master/changelog.md"
 }