From 52e10335dc16dae29a32abf1a5fa9a3912fc0f79 Mon Sep 17 00:00:00 2001
From: KOWX712 <leecc0503@gmail.com>
Date: Sat, 2 Nov 2024 17:58:09 +0800
Subject: [PATCH] v1.6

---
 changelog.md                         |  3 +++
 lite-script_only/README.md           |  3 +++
 lite-script_only/UpdateTargetList.sh |  2 +-
 module/common/UpdateTargetList.sh    |  5 +----
 module/customize.sh                  | 10 ++++------
 module/module.prop                   |  4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/changelog.md b/changelog.md
index 82b5023..7dd8a79 100755
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,9 @@ GitHub release: [Tricky Addon: Update Target List](https://github.com/KOWX712/Tr
 Telegram channel: [KOW's Little World](https://t.me/kowchannel)
 
 ## Changelog
+### v1.6
+- Updated something
+
 ### v1.5
 - Fixed some known issue
 - Updated something
diff --git a/lite-script_only/README.md b/lite-script_only/README.md
index 6a1f865..6d0a8cf 100644
--- a/lite-script_only/README.md
+++ b/lite-script_only/README.md
@@ -4,6 +4,9 @@
 - Recommend to run with MT manager
 
 ## Changelog
+### v1.6
+- Remain same with v1.5
+
 ### v1.5
 - Reduced size
 - Removed useless code
diff --git a/lite-script_only/UpdateTargetList.sh b/lite-script_only/UpdateTargetList.sh
index 43dcd87..9780c7a 100644
--- a/lite-script_only/UpdateTargetList.sh
+++ b/lite-script_only/UpdateTargetList.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # by KOW
-# Tricky Addon Lite: Update Target List Script v1.5
+# Tricky Addon Lite: Update Target List Script v1.6 (v1.5)
 # GitHub Repository: https://github.com/KOWX712/Tricky-Addon-Update-Target-List/blob/master/lite-script_only/README.md
 # Telegram channel: https://t.me/kowchannel
 
diff --git a/module/common/UpdateTargetList.sh b/module/common/UpdateTargetList.sh
index 13bc523..e266026 100644
--- a/module/common/UpdateTargetList.sh
+++ b/module/common/UpdateTargetList.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-# by KOW, telegram channel: https://t.me/kowchannel
-
 # This script will put all non-system app into /data/adb/tricky_store/target.txt
-# Using module to put normal app into system app may exclude corresponding app from this script too, please disable it if you found this script doesn't work.
 MODDIR="/data/adb/tricky_store/target_list_config"
 
 echo "- Checking config files..."
@@ -39,7 +36,7 @@ echo "- Adding addition app... "
 echo " "
 for app in $ADDITION; do
     app=$(echo "$app" | tr -d '[:space:]')
-    if ! grep -Fxq "$app" /data/adb/tricky_store/target.txt; then
+    if ! grep -Fq "$app" /data/adb/tricky_store/target.txt; then
         echo "$app" >> /data/adb/tricky_store/target.txt
     fi
 done
diff --git a/module/customize.sh b/module/customize.sh
index 2e1cff9..2edceeb 100644
--- a/module/customize.sh
+++ b/module/customize.sh
@@ -18,8 +18,7 @@ TS="/data/adb/tricky_store"
 CONFIG_DIR="$TS/target_list_config"
 MODNAME=$(grep '^id=' "$MODPATH/module.prop" | awk -F= '{print $2}' | xargs)
 ORG_DIR="/data/adb/modules/$MODNAME"
-EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE")
-ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
+kb="$COMPATH/.default"
 
 if [ -d "$TS" ]; then
     ui_print "- Tricky store module installed"
@@ -50,6 +49,7 @@ key_check() {
 }
 
 add_exclude() {
+    EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE")
     for app in $EXCLUDE; do
         app=$(echo "$app" | tr -d '[:space:]')
         if ! grep -Fq "$app" $COMPATH/EXCLUDE; then
@@ -60,6 +60,7 @@ add_exclude() {
 }
 
 add_addition() {
+    ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
     for app in $ADDITION; do
         app=$(echo "$app" | tr -d '[:space:]')
         if ! grep -Fq "$app" $COMPATH/ADDITION; then
@@ -114,7 +115,6 @@ if [ -f "$ORG_DIR/system.prop" ]; then
     fi
 fi
 
-kb="$COMPATH/.default"
 ui_print "*********************************************"
 ui_print "- Do you want to replace tricky store keybox?"
 ui_print "  VOL [+]: YES"
@@ -126,13 +126,11 @@ if [[ "$keycheck" == "KEY_VOLUMEUP" ]]; then
     ui_print "- Backing up original keybox..."
     ui_print "- Replacing keybox..."
     ui_print "*********************************************"
-    
     if [ -f "$ORG_DIR/common/origkeybox" ]; then
         mv "$ORG_DIR/common/origkeybox" "$COMPATH/origkeybox"
     else
         mv "$TS/keybox.xml" "$COMPATH/origkeybox"
     fi
-    
     mv "$kb" "$TS/keybox.xml"
 else
     if [ -f "$ORG_DIR/common/origkeybox" ]; then
@@ -144,4 +142,4 @@ fi
 
 ui_print " "
 ui_print "- Installation completed successfully! "
-ui_print " "
+ui_print " "
\ No newline at end of file
diff --git a/module/module.prop b/module/module.prop
index ad21e2c..f3e1f8d 100644
--- a/module/module.prop
+++ b/module/module.prop
@@ -1,7 +1,7 @@
 id=TA_utl
 name=Tricky Addon: Update Target List
-version=v1.5
-versionCode=150
+version=v1.6
+versionCode=160
 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/master/update.json
\ No newline at end of file