diff --git a/module/common/temp/remove b/module/common/temp/remove deleted file mode 100644 index e69de29..0000000 diff --git a/module/customize.sh b/module/customize.sh index 5e8fef2..2463d7c 100644 --- a/module/customize.sh +++ b/module/customize.sh @@ -4,6 +4,7 @@ COMPATH="$MODPATH/common" TS="/data/adb/modules/tricky_store" SCRIPT_DIR="/data/adb/tricky_store" CONFIG_DIR="$SCRIPT_DIR/target_list_config" +MODID=`grep_prop id $TMPDIR/module.prop` NEW_MODID=.TA_utl kb="$COMPATH/.default" diff --git a/module/install_func.sh b/module/install_func.sh index e54a086..3a36bbd 100644 --- a/module/install_func.sh +++ b/module/install_func.sh @@ -8,10 +8,30 @@ initialize() { if [ -d "/data/adb/modules/$NEW_MODID" ]; then rm -rf "/data/adb/modules/$NEW_MODID" fi + cp "$MODPATH/module.prop" "$COMPATH/temp/module.prop" cp "$COMPATH/.default" "$COMPATH/temp/.default" mv "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh" + set_perm $SCRIPT_DIR/UpdateTargetList.sh 0 2000 0755 + set_perm $COMPATH/get_extra.sh 0 2000 0755 + set_perm $COMPATH/get_WebUI.sh 0 2000 0755 + + if [ "$ACTION" = "false" ]; then + rm -f "$MODPATH/action.sh" + rm -f "$COMPATH/get_WebUI.sh" + echo "**********************************************" + echo "- Tricky Addon's visibility in root manager?" + echo " VOL [+]: Visible" + echo " VOL [-]: Invisible (default)" + echo "**********************************************" + key_check + if [[ "$keycheck" == "KEY_VOLUMEUP" ]]; then + echo "- Setting to visible..." + rm -rf "$COMPATH/temp" + NEW_MODID="$MODID" + fi + fi sed -i "s|\"set-path\"|\"/data/adb/modules/$NEW_MODID/common/\"|" "$MODPATH/webroot/index.js" || { ui_print "! Failed to set path" abort @@ -22,17 +42,8 @@ initialize() { } mv "$MODPATH/bin/$(getprop ro.product.cpu.abi)/aapt" "$COMPATH/aapt" - rm -rf "$MODPATH/bin" - set_perm $COMPATH/aapt 0 2000 0755 - set_perm $SCRIPT_DIR/UpdateTargetList.sh 0 2000 0755 - set_perm $COMPATH/get_extra.sh 0 2000 0755 - set_perm $COMPATH/get_WebUI.sh 0 2000 0755 - - if [ "$ACTION" = "false" ]; then - rm -f "$MODPATH/action.sh" - rm -f "$COMPATH/get_WebUI.sh" - fi + rm -rf "$MODPATH/bin" } add_exclude() { @@ -85,4 +96,24 @@ migrate_old_boot_hash() { else rm -f "$COMPATH/boot_hash" fi +} + +key_check() { + while true; do + key_check=$(/system/bin/getevent -qlc 1) + key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_') + key_status=$(echo "$key_check" | awk '{ print $4 }') + if [[ "$key_event" == *"KEY_"* && "$key_status" == "DOWN" ]]; then + keycheck="$key_event" + break + fi + done + while true; do + key_check=$(/system/bin/getevent -qlc 1) + key_event=$(echo "$key_check" | awk '{ print $3 }' | grep 'KEY_') + key_status=$(echo "$key_check" | awk '{ print $4 }') + if [[ "$key_event" == *"KEY_"* && "$key_status" == "UP" ]]; then + break + fi + done } \ No newline at end of file diff --git a/module/service.sh b/module/service.sh index f1787ba..fa18aca 100644 --- a/module/service.sh +++ b/module/service.sh @@ -18,20 +18,32 @@ elif [ ! -d "$TSPA" ] && [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; the rm -f "/storage/emulated/0/stop-tspa-auto-target" fi -if [ "$KSU" ] || [ "$APATCH" ]; then - rm -f "$MODPATH/module.prop" +if [ -d "$MODPATH/common/temp" ]; then + if [ "$KSU" ] || [ "$APATCH" ]; then + rm -f "$MODPATH/module.prop" + fi + if [ ! -d "$HIDE_DIR" ]; then + mv "$MODPATH" "$HIDE_DIR" + elif [[ "$MODPATH" != "$HIDE_DIR" ]]; then + rm -rf "$MODPATH" + exit 0 + fi + MODPATH="$HIDE_DIR" fi -if [ ! -d "$HIDE_DIR" ]; then - mv "$MODPATH" "$HIDE_DIR" -fi -MODPATH="$HIDE_DIR" + OUTPUT_APP="$MODPATH/common/applist" OUTPUT_SKIP="$MODPATH/common/skiplist" if [ ! -d "$TS" ]; then - cp -rf "$MODPATH/common/temp/" "/data/adb/modules/TA_utl/" - rm -rf "$MODPATH" - exit 1 + if [ -d "$MODPATH/common/temp" ]; then + mkdir -p "/data/adb/modules/TA_utl" + cp -rf "$MODPATH/common/temp/*" "/data/adb/modules/TA_utl/" + touch "/data/adb/modules/TA_utl/remove" + exit 1 + else + touch "$MODPATH/remove" + exit 1 + fi elif [ -f "$TS/disable" ]; then exit 1 else @@ -44,7 +56,9 @@ else if [ -d "$TS/webroot" ]; then rm -rf "$TS/webroot" fi - ln -s "$MODPATH/webroot" "$TS/webroot" + if [ -d "$MODPATH/common/temp" ]; then + ln -s "$MODPATH/webroot" "$TS/webroot" + fi fi until [ "$(getprop sys.boot_completed)" = "1" ]; do sleep 1 diff --git a/module/uninstall.sh b/module/uninstall.sh new file mode 100644 index 0000000..c8ecc85 --- /dev/null +++ b/module/uninstall.sh @@ -0,0 +1,21 @@ +MODPATH=${0%/*} +TS="/data/adb/modules/tricky_store" +SCRIPT_DIR="/data/adb/tricky_store" + +# Enable back TSupport-A auto update +if [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; then + rm -f "/storage/emulated/0/stop-tspa-auto-target" +fi + +# Remove residue and restore aosp keybox. +rm -rf "$SCRIPT_DIR/target_list_config" +rm -f "$SCRIPT_DIR/UpdateTargetList.sh" +rm -f "/data/adb/boot_hash" +if [ -d "$TS" ]; then + if [ -f "$TS/action.sh" ]; then + rm -f "$TS/action.sh" + else + rm -rf "$TS/webroot" + fi +fi +xxd -r -p "$MODPATH/common/.default" | base64 -d > "$SCRIPT_DIR/keybox.xml"