Mirrors/revanced-magisk-module
1
0
Fork 0
mirror of https://github.com/j-hc/revanced-magisk-module.git synced 2025-05-05 09:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

better error reporting

Browse Source
This commit is contained in:
j-hc 2023-02-27 17:40:48 +03:00
parent 45293ae749
commit a91673d8f6
No known key found for this signature in database
GPG Key ID: FCBF5E9C57092AD9
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@ -19,7 +19,11 @@ toml_prep "$(cat 2>/dev/null "${1:-config.toml}")" || abort "could not find conf
main_config_t=$(toml_get_table "") main_config_t=$(toml_get_table "")
COMPRESSION_LEVEL=$(toml_get "$main_config_t" compression-level) || abort "ERROR: compression-level is missing" COMPRESSION_LEVEL=$(toml_get "$main_config_t" compression-level) || abort "ERROR: compression-level is missing"
ENABLE_MAGISK_UPDATE=$(toml_get "$main_config_t" enable-magisk-update) || abort "ERROR: enable-magisk-update is missing" ENABLE_MAGISK_UPDATE=$(toml_get "$main_config_t" enable-magisk-update) || abort "ERROR: enable-magisk-update is missing"
PARALLEL_JOBS=$(toml_get "$main_config_t" parallel-jobs) || abort "ERROR: parallel-jobs is missing" if [ "$ENABLE_MAGISK_UPDATE" = true ] && [ -z "${GITHUB_REPOSITORY:-}" ]; then
pr "You are building locally. Magisk updates will not be enabled."
ENABLE_MAGISK_UPDATE=false
fi
PARALLEL_JOBS=$(toml_get "$main_config_t" parallel-jobs) || PARALLEL_JOBS=1
BUILD_MINDETACH_MODULE=$(toml_get "$main_config_t" build-mindetach-module) || abort "ERROR: build-mindetach-module is missing" BUILD_MINDETACH_MODULE=$(toml_get "$main_config_t" build-mindetach-module) || abort "ERROR: build-mindetach-module is missing"
LOGGING_F=$(toml_get "$main_config_t" logging-to-file) && vtf "$LOGGING_F" "logging-to-file" || LOGGING_F=false LOGGING_F=$(toml_get "$main_config_t" logging-to-file) && vtf "$LOGGING_F" "logging-to-file" || LOGGING_F=false
CONF_PATCHES_VER=$(toml_get "$main_config_t" patches-version) || CONF_PATCHES_VER= CONF_PATCHES_VER=$(toml_get "$main_config_t" patches-version) || CONF_PATCHES_VER=
@ -92,7 +96,7 @@ for table_name in $(toml_get_table_names); do
if [ "$LOGGING_F" = true ]; then if [ "$LOGGING_F" = true ]; then
logf=logs/"${table_name,,}.log" logf=logs/"${table_name,,}.log"
: >"$logf" : >"$logf"
(build_rv 2>&1 app_args | tee "$logf") & { build_rv 2>&1 app_args | tee "$logf"; } &
else else
build_rv app_args & build_rv app_args &
fi fi

19
utils.sh
View File

@ -7,9 +7,7 @@ BUILD_DIR="build"
PKGS_LIST="${TEMP_DIR}/module-pkgs" PKGS_LIST="${TEMP_DIR}/module-pkgs"
if [ "${GITHUB_TOKEN:-}" ]; then GH_HEADER="Authorization: token ${GITHUB_TOKEN}"; else GH_HEADER=; fi if [ "${GITHUB_TOKEN:-}" ]; then GH_HEADER="Authorization: token ${GITHUB_TOKEN}"; else GH_HEADER=; fi
GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-"j-hc/revanced-magisk-module"}
NEXT_VER_CODE=${NEXT_VER_CODE:-$(date +'%Y%m%d')} NEXT_VER_CODE=${NEXT_VER_CODE:-$(date +'%Y%m%d')}
WGET_HEADER="User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Firefox/108.0"
REBUILD=false REBUILD=false
OS=$(uname -o) OS=$(uname -o)
@ -36,7 +34,10 @@ toml_get() {
# --------------------------------------------------- # ---------------------------------------------------
pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; } pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; }
epr() { echo -e "\033[0;31m[-] ${1}\033[0m"; } epr() {
echo -e "\033[0;31m[-] ${1}\033[0m"
if [ "${GITHUB_REPOSITORY:-}" ]; then echo -e "::error::utils.sh \033[0;31m[-] ${1}\033[0m\n"; fi
}
abort() { echo >&2 -e "\033[0;31mABORT: $1\033[0m" && exit 1; } abort() { echo >&2 -e "\033[0;31mABORT: $1\033[0m" && exit 1; }
get_prebuilts() { get_prebuilts() {
@ -120,7 +121,7 @@ set_prebuilts() {
HTMLQ="${TEMP_DIR}/htmlq" HTMLQ="${TEMP_DIR}/htmlq"
} }
req() { wget -nv -O "$2" --header="$WGET_HEADER" "$1"; } req() { wget -nv -O "$2" --header="User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Firefox/108.0" "$1"; }
gh_req() { wget -nv -O "$2" --header="$GH_HEADER" "$1"; } gh_req() { wget -nv -O "$2" --header="$GH_HEADER" "$1"; }
log() { echo -e "$1 " >>build.md; } log() { echo -e "$1 " >>build.md; }
get_largest_ver() { get_largest_ver() {
@ -155,6 +156,10 @@ isoneof() {
# -------------------- apkmirror -------------------- # -------------------- apkmirror --------------------
dl_apkmirror() { dl_apkmirror() {
local url=$1 version=${2// /-} output=$3 arch=$4 dpi=$5 local url=$1 version=${2// /-} output=$3 arch=$4 dpi=$5
[ "${DRYRUN:-}" ] && {
echo >"$output"
return 0
}
local resp node app_table dlurl="" local resp node app_table dlurl=""
[ "$arch" = universal ] && apparch=(universal noarch 'arm64-v8a + armeabi-v7a') || apparch=("$arch") [ "$arch" = universal ] && apparch=(universal noarch 'arm64-v8a + armeabi-v7a') || apparch=("$arch")
url="${url}/${url##*/}-${version//./-}-release/" url="${url}/${url##*/}-${version//./-}-release/"
@ -171,8 +176,8 @@ dl_apkmirror() {
fi fi
done done
[ -z "$dlurl" ] && return 1 [ -z "$dlurl" ] && return 1
url="https://www.apkmirror.com$(req "$dlurl" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" url="https://www.apkmirror.com$(req "$dlurl" - | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" url="https://www.apkmirror.com$(req "$url" - | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
req "$url" "$output" req "$url" "$output"
} }
get_apkmirror_vers() { get_apkmirror_vers() {
@ -414,7 +419,7 @@ build_rv() {
"${app_name} ${RV_BRAND}" \ "${app_name} ${RV_BRAND}" \
"$version" \ "$version" \
"${app_name} ${RV_BRAND} Magisk module" \ "${app_name} ${RV_BRAND} Magisk module" \
"https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/update/${upj}" \ "https://raw.githubusercontent.com/${GITHUB_REPOSITORY:-}/update/${upj}" \
"$base_template" "$base_template"
local module_output="${app_name_l}-${RV_BRAND_F}-magisk-v${version}-${arch}.zip" local module_output="${app_name_l}-${RV_BRAND_F}-magisk-v${version}-${arch}.zip"