From 2ff4eec61e22822de8983ba7630449ece578a0b3 Mon Sep 17 00:00:00 2001 From: KOWX712 Date: Thu, 5 Jun 2025 15:21:35 +0800 Subject: [PATCH] fix: update fail reference: github.com/bindhosts/bindhosts/commit/7aacf5afacd019353f788991f47afa1382ccff6b github.com/bindhosts/bindhosts/commit/c1bcc06869da5255c0766dc8c2072bb98e1acd6b Co-Authored-By: backslashxx <118538522+backslashxx@users.noreply.github.com> --- module/common/get_extra.sh | 31 +++++++++++++++++++------------ module/post-fs-data.sh | 7 +++++++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh index fbf4035..c4dc4b6 100644 --- a/module/common/get_extra.sh +++ b/module/common/get_extra.sh @@ -83,19 +83,26 @@ get_update() { } install_update() { - if command -v magisk >/dev/null 2>&1; then - magisk --install-module "$MODPATH/tmp/module.zip" || exit 1 - elif command -v apd >/dev/null 2>&1; then - apd module install "$MODPATH/tmp/module.zip" || exit 1 - elif command -v ksud >/dev/null 2>&1; then - ksud module install "$MODPATH/tmp/module.zip" || exit 1 - else - exit 1 - fi + zip_file="$MODPATH/tmp/module.zip" + . "$MODPATH/manager.sh" - rm -f "$MODPATH/tmp/module.zip" - rm -f "$MODPATH/tmp/changelog.md" - rm -f "$MODPATH/tmp/version" + case $MANAGER in + APATCH) + apd module install "$zip_file" || exit 1 + ;; + KSU) + ksud module install "$zip_file" || exit 1 + ;; + MAGISK) + magisk --install-module "$zip_file" || exit 1 + ;; + *) + rm -f "$zip_file" "$MODPATH/tmp/changelog.md" "$MODPATH/tmp/version" || true + exit 1 + ;; + esac + + rm -f "$zip_file" "$MODPATH/tmp/changelog.md" "$MODPATH/tmp/version" || true } release_note() { diff --git a/module/post-fs-data.sh b/module/post-fs-data.sh index 80f4489..443ce96 100644 --- a/module/post-fs-data.sh +++ b/module/post-fs-data.sh @@ -17,3 +17,10 @@ fi [ -L "$TS/webroot" ] && rm -f "$TS/webroot" [ -L "$TS/action.sh" ] && rm -f "$TS/action.sh" + +# detect root manager +[ "$APATCH" = "true" ] && MANAGER="APATCH" +[ "$KSU" = "true" ] && MANAGER="KSU" +[ ! "$APATCH" = "true" ] && [ ! "$KSU" = "true" ] && MANAGER="MAGISK" +echo "MANAGER=$MANAGER" > "$MODPATH/common/manager.sh" +chmod 755 "$MODPATH/common/manager.sh"