diff --git a/bin/toml/toml-arm b/bin/toml/toml-arm deleted file mode 100755 index 9a4aa9d..0000000 Binary files a/bin/toml/toml-arm and /dev/null differ diff --git a/bin/toml/toml-arm64 b/bin/toml/toml-arm64 deleted file mode 100755 index 2436b4f..0000000 Binary files a/bin/toml/toml-arm64 and /dev/null differ diff --git a/bin/toml/toml-x86_64 b/bin/toml/toml-x86_64 deleted file mode 100755 index 49e8d67..0000000 Binary files a/bin/toml/toml-x86_64 and /dev/null differ diff --git a/bin/toml/tq-arm b/bin/toml/tq-arm new file mode 100755 index 0000000..9ec37bd Binary files /dev/null and b/bin/toml/tq-arm differ diff --git a/bin/toml/tq-arm64 b/bin/toml/tq-arm64 new file mode 100755 index 0000000..39dda08 Binary files /dev/null and b/bin/toml/tq-arm64 differ diff --git a/bin/toml/tq-x86_64 b/bin/toml/tq-x86_64 new file mode 100755 index 0000000..2795ff2 Binary files /dev/null and b/bin/toml/tq-x86_64 differ diff --git a/config.toml b/config.toml index 638e266..8f66fb9 100755 --- a/config.toml +++ b/config.toml @@ -1,4 +1,4 @@ -enable-magisk-update = true # set this to false if you do not want to receive updates for the module in magisk app +enable-magisk-update = true # set this to false if you do not want to receive updates for the module in magisk app parallel-jobs = 1 # add 'enabled = false' for not patching a specific app or remove it from the config diff --git a/utils.sh b/utils.sh index a01587b..eaefc6f 100755 --- a/utils.sh +++ b/utils.sh @@ -10,7 +10,7 @@ if [ "${GITHUB_TOKEN-}" ]; then GH_HEADER="Authorization: token ${GITHUB_TOKEN}" NEXT_VER_CODE=${NEXT_VER_CODE:-$(date +'%Y%m%d')} OS=$(uname -o) -toml_prep() { __TOML__=$($TOML get "$1" .); } +toml_prep() { __TOML__=$($TOML --output json --file "$1" .); } toml_get_table_names() { jq -r -e 'to_entries[] | select(.value | type == "object") | .key' <<<"$__TOML__"; } toml_get_table_main() { jq -r -e 'to_entries | map(select(.value | type != "object")) | from_entries' <<<"$__TOML__"; } toml_get_table() { jq -r -e ".\"${1}\"" <<<"$__TOML__"; } @@ -117,10 +117,10 @@ get_prebuilts() { if [ "$(uname -m)" = aarch64 ]; then arch=arm64; else arch=arm; fi HTMLQ="${BIN_DIR}/htmlq/htmlq-${arch}" AAPT2="${BIN_DIR}/aapt2/aapt2-${arch}" - TOML="${BIN_DIR}/toml/toml-${arch}" + TOML="${BIN_DIR}/toml/tq-${arch}" else HTMLQ="${BIN_DIR}/htmlq/htmlq-x86_64" - TOML="${BIN_DIR}/toml/toml-x86_64" + TOML="${BIN_DIR}/toml/tq-x86_64" fi mkdir -p ${MODULE_TEMPLATE_DIR}/bin/arm64 ${MODULE_TEMPLATE_DIR}/bin/arm ${MODULE_TEMPLATE_DIR}/bin/x86 ${MODULE_TEMPLATE_DIR}/bin/x64 gh_dl "${MODULE_TEMPLATE_DIR}/bin/arm64/cmpr" "https://github.com/j-hc/cmpr/releases/latest/download/cmpr-arm64-v8a"