diff --git a/README.md b/README.md index 2202bfb..778739f 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# **Tricky Addon: Update Target List** +# **Tricky Addon - Update Target List** An addon module for tricky store --- diff --git a/changelog.md b/changelog.md index 7dd8a79..019e531 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.7 +- Fixed update issue (Will start to work in next update) + ### v1.6 - Updated something diff --git a/lite-script_only/README.md b/lite-script_only/README.md index 6d0a8cf..c1d7b6f 100644 --- a/lite-script_only/README.md +++ b/lite-script_only/README.md @@ -4,17 +4,14 @@ - Recommend to run with MT manager ## Changelog -### v1.6 +### v1.6, v1.7 - Remain same with v1.5 ### v1.5 - Reduced size - Removed useless code -### v1.4.1 -- Remain same with v1.3.1 - -### v1.4 +### v1.4, v1.4.1 - Remain same with v1.3.1 ### v1.3.1 diff --git a/lite-script_only/UpdateTargetList.sh b/lite-script_only/UpdateTargetList.sh index 9780c7a..3b21c69 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.6 (v1.5) +# Tricky Addon Lite: Update Target List Script v1.7 (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/action.sh b/module/action.sh index 0d0f459..479dd77 100644 --- a/module/action.sh +++ b/module/action.sh @@ -1,14 +1,15 @@ -TS="/data/adb/tricky_store" +SCRIPT_DIR="/data/adb/tricky_store" + echo "**********************************************" echo "- Staring script..." echo " " -if [ ! -f "$TS/UpdateTargetList.sh" ]; then +if [ ! -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then echo "! Script missing, please install module again" echo "**********************************************" exit 1 else - . "$TS/UpdateTargetList.sh" + . "$SCRIPT_DIR/UpdateTargetList.sh" fi echo "**********************************************" diff --git a/module/customize.sh b/module/customize.sh index 2edceeb..e400859 100644 --- a/module/customize.sh +++ b/module/customize.sh @@ -1,5 +1,6 @@ SKIPUNZIP=0 DEBUG=false + ui_print " "; if [ "$APATCH" ]; then ui_print "- APatch:$APATCH_VER│$APATCH_VER_CODE" @@ -14,8 +15,9 @@ else fi COMPATH="$MODPATH/common" -TS="/data/adb/tricky_store" -CONFIG_DIR="$TS/target_list_config" +TS="/data/adb/modules/tricky_store" +SCRIPT_DIR="/data/adb/tricky_store" +CONFIG_DIR="$SCRIPT_DIR/target_list_config" MODNAME=$(grep '^id=' "$MODPATH/module.prop" | awk -F= '{print $2}' | xargs) ORG_DIR="/data/adb/modules/$MODNAME" kb="$COMPATH/.default" @@ -72,10 +74,10 @@ add_addition() { ui_print "- Installing..." -if [ -f "$TS/UpdateTargetList.sh" ]; then - rm -f "$TS/UpdateTargetList.sh" +if [ -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then + rm -f "$SCRIPT_DIR/UpdateTargetList.sh" fi -mv "$COMPATH/UpdateTargetList.sh" "$TS/UpdateTargetList.sh" +mv "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh" cp "$MODPATH/module.prop" "$COMPATH/module.prop.orig" if [ -d "$CONFIG_DIR" ]; then @@ -129,9 +131,9 @@ if [[ "$keycheck" == "KEY_VOLUMEUP" ]]; then if [ -f "$ORG_DIR/common/origkeybox" ]; then mv "$ORG_DIR/common/origkeybox" "$COMPATH/origkeybox" else - mv "$TS/keybox.xml" "$COMPATH/origkeybox" + mv "$SCRIPT_DIR/keybox.xml" "$COMPATH/origkeybox" fi - mv "$kb" "$TS/keybox.xml" + mv "$kb" "$SCRIPT_DIR/keybox.xml" else if [ -f "$ORG_DIR/common/origkeybox" ]; then mv "$ORG_DIR/common/origkeybox" "$COMPATH/origkeybox" diff --git a/module/module.prop b/module/module.prop index 2f2d84d..a694843 100644 --- a/module/module.prop +++ b/module/module.prop @@ -1,7 +1,7 @@ id=TA_utl name=Tricky Addon - Update Target List -version=v1.6 -versionCode=160 +version=v1.7 +versionCode=170 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 diff --git a/module/service.sh b/module/service.sh index 962c8e3..e5b8675 100644 --- a/module/service.sh +++ b/module/service.sh @@ -1,5 +1,6 @@ MODPATH=${0%/*} TS="/data/adb/modules/tricky_store" +SCRIPT_DIR="/data/adb/tricky_store" hash_value=$(grep -v '^#' "$MODPATH/boot_hash" | tr -d '[:space:]') if [ -n "$hash_value" ]; then @@ -18,10 +19,13 @@ if [ ! -d "$TS" ]; then elif [ -f "$TS/disable" ]; then sed -i 's/^description=.*/description=Tricky store is disabled/' "$MODPATH/module.prop" touch "$MODPATH/disable" +elif [ ! -f "$SCRIPT_DIR/UpdateTargetList.sh" ]; then + sed -i 's/^description=.*/description=Script missing, please install module again/' "$MODPATH/module.prop" + touch "$MODPATH/disable" else cat "$MODPATH/common/module.prop.orig" > "$MODPATH/module.prop" until [ "$(getprop sys.boot_completed)" = "1" ]; do sleep 1 done - . "$TS/UpdateTargetList.sh" + . "$SCRIPT_DIR/UpdateTargetList.sh" fi \ No newline at end of file diff --git a/module/uninstall.sh b/module/uninstall.sh index fda929f..f8e2333 100644 --- a/module/uninstall.sh +++ b/module/uninstall.sh @@ -1,9 +1,10 @@ MODPATH=${0%/*} -TS="/data/adb/tricky_store" +SCRIPT_DIR="/data/adb/tricky_store" + # Remove residue and restore original keybox. -rm -rf "$TS/target_list_config" -rm -f "$TS/UpdateTargetList.sh" +rm -rf "$SCRIPT_DIR/target_list_config" +rm -f "$SCRIPT_DIR/UpdateTargetList.sh" if [ -f "$MODPATH/common/origkeybox" ]; then - rm -f "$TS/keybox.xml" - mv "$MODPATH/common/origkeybox" "$TS/keybox.xml" + rm -f "$SCRIPT_DIR/keybox.xml" + mv "$MODPATH/common/origkeybox" "$SCRIPT_DIR/keybox.xml" fi \ No newline at end of file