rename dpi and arch to apkmirror-dpi and apkmirror-arch

This commit is contained in:
j-hc 2023-07-12 00:06:06 +03:00
parent 704f597384
commit fc6df1a45b
No known key found for this signature in database
GPG Key ID: FCBF5E9C57092AD9
3 changed files with 10 additions and 11 deletions

View File

@ -38,8 +38,7 @@ uptodown-dlurl = "https://spotify.en.uptodown.com/android"
apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/"
module-prop-name = "some-app-magisk" # magisk module prop name.
merge-integrations = false # set false to never merge even when needed. default: true
dpi = "360-480dpi" # used to select apk variant from apkmirror. default: nodpi
arch = "arm64-v8a" # 'arm64-v8a', 'arm-v7a', 'universal', 'both'. default: universal
# arch option is only for downloading from apkmirror. both downloads both arm64-v8a and arm-v7a.
# and does not affect anything else
apkmirror-dpi = "360-480dpi" # used to select apk variant from apkmirror. default: nodpi
apkmirror-arch = "arm64-v8a" # 'arm64-v8a', 'arm-v7a', 'universal', 'both'. 'both' downloads both arm64-v8a and arm-v7a. default: universal
# arch option is only for downloading from apkmirror and does not affect anything else.
```

View File

@ -122,14 +122,14 @@ for table_name in $(toml_get_table_names); do
app_args[dl_from]=apkmirror
} || app_args[apkmirror_dlurl]=""
if [ -z "${app_args[dl_from]:-}" ]; then abort "ERROR: no 'apkmirror_dlurl', 'uptodown_dlurl' or 'apkmonk_dlurl' option was set for '$table_name'."; fi
app_args[arch]=$(toml_get "$t" arch) && {
app_args[arch]=$(toml_get "$t" apkmirror-arch) && {
if ! isoneof "${app_args[arch]}" universal both arm64-v8a arm-v7a; then
abort "ERROR: arch '${app_args[arch]}' is not a valid option for '${table_name}': only 'universal', 'arm64-v8a', 'arm-v7a', 'both' is allowed"
fi
} || app_args[arch]="universal"
app_args[include_stock]=$(toml_get "$t" include-stock) || app_args[include_stock]=true && vtf "${app_args[include_stock]}" "include-stock"
app_args[merge_integrations]=$(toml_get "$t" merge-integrations) || app_args[merge_integrations]=true && vtf "${app_args[merge_integrations]}" "merge-integrations"
app_args[dpi]=$(toml_get "$t" dpi) || app_args[dpi]="nodpi"
app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi"
table_name_f=${table_name,,}
table_name_f=${table_name_f// /-}
app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || app_args[module_prop_name]="${table_name_f}-jhc"

View File

@ -26,7 +26,7 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/"
build-mode = "both"
excluded-patches = ""
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/"
arch = "both"
apkmirror-arch = "both" # both arm64-v8a and arm-v7a
[Music-Extended]
app-name = "Music"
@ -35,7 +35,7 @@ integrations-source = "inotia00/revanced-integrations"
rv-brand = "ReVanced Extended"
build-mode = "both"
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/"
arch = "both"
apkmirror-arch = "both"
[Twitter]
build-mode = "apk"
@ -55,7 +55,7 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/redditinc/reddit/"
[Messenger]
apkmirror-dlurl = "https://www.apkmirror.com/apk/facebook-2/messenger/"
arch = "arm64-v8a"
apkmirror-arch = "arm64-v8a"
[Spotify]
enabled = false
@ -64,7 +64,7 @@ uptodown-dlurl = "https://spotify.en.uptodown.com/android"
[Citra]
enabled = false
apkmirror-dlurl = "https://www.apkmirror.com/apk/citra-emulator/citra-emulator/"
arch = "arm64-v8a"
apkmirror-arch = "arm64-v8a"
[Backdrops]
enabled = false
@ -85,7 +85,7 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/smart-launcher-team/icon-pack-s
[TickTick]
enabled = false
apkmirror-dlurl = "https://www.apkmirror.com/apk/appest-inc/ticktick-to-do-list-with-reminder-day-planner/"
arch = "arm64-v8a"
apkmirror-arch = "arm64-v8a"
[Tasker]
enabled = false