diff --git a/module/bin/arm64-v8a/curl b/module/bin/arm64-v8a/curl deleted file mode 100644 index 6305598..0000000 Binary files a/module/bin/arm64-v8a/curl and /dev/null differ diff --git a/module/bin/armeabi-v7a/curl b/module/bin/armeabi-v7a/curl deleted file mode 100644 index 70ad236..0000000 Binary files a/module/bin/armeabi-v7a/curl and /dev/null differ diff --git a/module/bin/x86/curl b/module/bin/x86/curl deleted file mode 100644 index 549c933..0000000 Binary files a/module/bin/x86/curl and /dev/null differ diff --git a/module/bin/x86_64/curl b/module/bin/x86_64/curl deleted file mode 100644 index f4415ca..0000000 Binary files a/module/bin/x86_64/curl and /dev/null differ diff --git a/module/common/get_exclude-list.sh b/module/common/get_exclude-list.sh index ee09621..7878e7e 100644 --- a/module/common/get_exclude-list.sh +++ b/module/common/get_exclude-list.sh @@ -2,17 +2,43 @@ MODPATH=${0%/*} OUTPUT="$MODPATH/exclude-list" +BBPATH="/data/adb/modules/busybox-ndk/system/*/busybox \ + /data/adb/magisk/busybox \ + /data/adb/ksu/bin/busybox \ + /data/adb/ap/bin/busybox" + +find_busybox() { + for path in $BBPATH; do + if [ -f "$path" ]; then + BUSYBOX="$path" + return 0 + fi + done + return 1 +} -if ! curl -s "https://modules.lsposed.org/modules.json" > /dev/null; then - exit 1 +# Check for wget binary +if ! command -v wget >/dev/null || grep -q "wget-curl" "$(command -v wget)"; then + if find_busybox; then + wget() { "$BUSYBOX" wget "$@"; } + else + echo "Error: busybox not found in specified paths." > "$OUTPUT" + exit 1 + fi fi # Fetch Xposed module package names -curl -s "https://modules.lsposed.org/modules.json" | \ +wget --no-check-certificate -q -O - "https://modules.lsposed.org/modules.json" 2>/dev/null | \ grep -o '"name":"[^"]*","description":' | \ awk -F'"' '{print $4}' > "$OUTPUT" # Fetch additional package names -curl -s "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/more-excldue.json" | \ +wget --no-check-certificate -q -O - "https://raw.githubusercontent.com/KOWX712/Tricky-Addon-Update-Target-List/master/more-excldue.json" 2>/dev/null | \ grep -o '"package-name": *"[^"]*"' | \ awk -F'"' '{print $4}' >> "$OUTPUT" + +# Check if the output directory is empty +if [ ! -s "$OUTPUT" ]; then + echo "Error: Failed to fetch data." > "$OUTPUT" + exit 1 +fi \ No newline at end of file diff --git a/module/customize.sh b/module/customize.sh index 338bb5f..8a160e4 100644 --- a/module/customize.sh +++ b/module/customize.sh @@ -18,8 +18,8 @@ COMPATH="$MODPATH/common" 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" +MODID=`grep_prop id $TMPDIR/module.prop` +ORG_DIR="/data/adb/modules/$MODID" kb="$COMPATH/.default" if [ ! -d "$TS" ]; then diff --git a/module/install_func.sh b/module/install_func.sh index 8453307..b951600 100644 --- a/module/install_func.sh +++ b/module/install_func.sh @@ -5,19 +5,11 @@ initialize() { cp "$MODPATH/module.prop" "$COMPATH/module.prop.orig" mv "$COMPATH/UpdateTargetList.sh" "$SCRIPT_DIR/UpdateTargetList.sh" - sed -i "s|\"set-path\"|\"/data/adb/modules/$MODNAME/common/\"|" "$MODPATH/webroot/index.js" || { + sed -i "s|\"set-path\"|\"/data/adb/modules/$MODID/common/\"|" "$MODPATH/webroot/index.js" || { ui_print "! Failed to replace path" abort } - # handle missing binary - if [ ! -f "/system/bin/curl" ]; then - mkdir -p "$MODPATH/system/bin" - mv "$MODPATH/bin/$(getprop ro.product.cpu.abi)/curl" "$MODPATH/system/bin/curl" - set_perm "$MODPATH/system/bin/curl" 0 2000 0777 - fi - rm -rf "$MODPATH/bin" - set_perm $SCRIPT_DIR/UpdateTargetList.sh 0 2000 0755 set_perm $COMPATH/get_exclude-list.sh 0 2000 0755 }