From d4b48998eb48962fad5f1239e0033e4636cc5943 Mon Sep 17 00:00:00 2001
From: KOWX712 <leecc0503@gmail.com>
Date: Sun, 3 Nov 2024 17:45:03 +0800
Subject: [PATCH] clarify rermark

remove useless code, unify variable,
---
 lite-script_only/README.md           |  4 ++++
 lite-script_only/UpdateTargetList.sh | 21 ++++++++++++---------
 module/common/UpdateTargetList.sh    | 24 ++++++++++--------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/lite-script_only/README.md b/lite-script_only/README.md
index c1d7b6f..7ae25c0 100644
--- a/lite-script_only/README.md
+++ b/lite-script_only/README.md
@@ -4,6 +4,10 @@
 - Recommend to run with MT manager
 
 ## Changelog
+### v1.8
+- More clarify remark in code
+- Remove useless code
+
 ### v1.6, v1.7
 - Remain same with v1.5
 
diff --git a/lite-script_only/UpdateTargetList.sh b/lite-script_only/UpdateTargetList.sh
index 3b21c69..1791403 100644
--- a/lite-script_only/UpdateTargetList.sh
+++ b/lite-script_only/UpdateTargetList.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 
-# by KOW
-# Tricky Addon Lite: Update Target List Script v1.7 (v1.5)
+# Tricky Addon Lite: Update Target List Script v1.8
 # GitHub Repository: https://github.com/KOWX712/Tricky-Addon-Update-Target-List/blob/master/lite-script_only/README.md
 # Telegram channel: https://t.me/kowchannel
 
 # This script will put all non-system app into /data/adb/tricky_store/target.txt
 
+###################################################
 # Configurable exclude and addition list
 # DO NOT remove default package names here
+###################################################
+
 EXCLUDE="
 oneplus
 coloros
@@ -22,14 +24,14 @@ io.github.vvb2060.keyattestation
 io.github.vvb2060.mahoshojo
 icu.nullptr.nativetest"
 
-echo " "
-echo " Staring script..."
-echo " "
+###################################################
+# Script
+###################################################
 
-> /data/adb/tricky_store/target.txt
-
-echo " Adding apps to target.txt..."
 echo " "
+echo "- Staring script..."
+echo " "
+echo "- Adding apps to target.txt..."
 
 EXCLUDE=$(echo "$EXCLUDE" | tr '\n' '|' | sed 's/^|//;s/|$//')
 ADDITION=$(echo "$ADDITION" | tr '\n' ' ' | sed 's/^ //;s/ $//')
@@ -45,4 +47,5 @@ for app in $ADDITION; do
     fi
 done
 
-echo " All done!"
+echo " "
+echo "- All done!"
diff --git a/module/common/UpdateTargetList.sh b/module/common/UpdateTargetList.sh
index e266026..01b5cc1 100644
--- a/module/common/UpdateTargetList.sh
+++ b/module/common/UpdateTargetList.sh
@@ -1,33 +1,29 @@
 #!/bin/sh
 
 # This script will put all non-system app into /data/adb/tricky_store/target.txt
-MODDIR="/data/adb/tricky_store/target_list_config"
+CONFIG_DIR="/data/adb/tricky_store/target_list_config"
 
 echo "- Checking config files..."
 echo " "
-if [ ! -f "$MODDIR/EXCLUDE" ]; then
-    echo "! Exclude list is missing!"
+if [ ! -f "$CONFIG_DIR/EXCLUDE" ]; then
+    echo "! Exclude list is missing, please install module again"
     exit 1
 else
-    echo "- Exclude config file found."
+    echo "- Exclude config file found"
     echo " "
 fi
-if [ ! -f "$MODDIR/ADDITION" ]; then
-    echo "! Addition list is missing"
+if [ ! -f "$CONFIG_DIR/ADDITION" ]; then
+    echo "! Addition list is missing, please install module again"
     exit 1
 else
-    echo "- Addition config file found."
+    echo "- Addition config file found"
     echo " "
 fi
 
-EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$MODDIR/EXCLUDE" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | tr '\n' '|' | sed 's/|$//')
-ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$MODDIR/ADDITION")
+EXCLUDE=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/EXCLUDE" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | tr '\n' '|' | sed 's/|$//')
+ADDITION=$(grep -vE '^[[:space:]]*#|^[[:space:]]*$' "$CONFIG_DIR/ADDITION")
 
-echo "- Overwritting target.txt"
-echo " "
-> /data/adb/tricky_store/target.txt
-
-echo "- Adding apps into /data/adb/tricky_store/target.txt"
+echo "- Adding apps into /data/adb/tricky_store/target.txt..."
 echo " "
 su -c pm list packages -3 </dev/null 2>&1 | cat | awk -F: '{print $2}' | grep -Ev "$EXCLUDE" > /data/adb/tricky_store/target.txt
 sleep 1