jq -> sed

This commit is contained in:
j-hc
2022-10-18 22:48:56 +03:00
parent f9934d2637
commit 16a0557c67
3 changed files with 13 additions and 7 deletions

View File

@ -23,13 +23,14 @@ jobs:
if [ -z "$TAG" ]; then TAG=0; fi
echo "NEXT_VER_CODE=$((TAG + 1))" >> $GITHUB_OUTPUT
- name: Build Modules/APKs
- name: Build modules/APKs
run: ./build.sh build
env:
GITHUB_REPOSITORY: $GITHUB_REPOSITORY
NEXT_VER_CODE: ${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}
- id: get_output
- name: Get output
id: get_output
run: |
BUILD_LOG=$(cat build.md)

View File

@ -35,7 +35,7 @@ jobs:
}
is_patches_latest() {
declare -r last_patches_url=$(wget -nv -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("jar"))')
declare -r last_patches_url=$(wget -nv -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | json_get 'browser_download_url' 'jar')
declare -r last_patches=${last_patches_url##*/}
cur_patches=$(sed -n 's/.*Patches: \(.*\)/\1/p' build.md | xargs)

View File

@ -18,21 +18,26 @@ POSTFSDATA_SH=$(cat $MODULE_SCRIPTS_DIR/post-fs-data.sh)
CUSTOMIZE_SH=$(cat $MODULE_SCRIPTS_DIR/customize.sh)
UNINSTALL_SH=$(cat $MODULE_SCRIPTS_DIR/uninstall.sh)
json_get() {
local key=$1 grep_for=${2:-}
grep "$key" | if [ "$grep_for" ]; then grep "$grep_for"; else cat; fi | sed -E 's/^[^:]*:\s?"(.*)",?/\1/'
}
get_prebuilts() {
echo "Getting prebuilts"
RV_CLI_URL=$(req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | jq -r '.assets[0].browser_download_url')
RV_CLI_URL=$(req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | json_get 'browser_download_url')
RV_CLI_JAR="${TEMP_DIR}/${RV_CLI_URL##*/}"
log "CLI: ${RV_CLI_URL##*/}"
RV_INTEGRATIONS_URL=$(req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | jq -r '.assets[0].browser_download_url')
RV_INTEGRATIONS_URL=$(req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | json_get 'browser_download_url')
RV_INTEGRATIONS_APK=${RV_INTEGRATIONS_URL##*/}
RV_INTEGRATIONS_APK="${RV_INTEGRATIONS_APK%.apk}-$(cut -d/ -f8 <<<"$RV_INTEGRATIONS_URL").apk"
log "Integrations: $RV_INTEGRATIONS_APK"
RV_INTEGRATIONS_APK="${TEMP_DIR}/${RV_INTEGRATIONS_APK}"
RV_PATCHES=$(req https://api.github.com/repos/revanced/revanced-patches/releases/latest -)
RV_PATCHES_CHANGELOG=$(echo "$RV_PATCHES" | jq -r '.body' | sed '/^$/N;/^\n$/D')
RV_PATCHES_URL=$(echo "$RV_PATCHES" | jq -r '.assets[].browser_download_url | select(endswith("jar"))')
RV_PATCHES_CHANGELOG=$(echo "$RV_PATCHES" | json_get 'body' | sed 's/\(\\n\)\+/\\n/g')
RV_PATCHES_URL=$(echo "$RV_PATCHES" | json_get 'browser_download_url' 'jar')
RV_PATCHES_JAR="${TEMP_DIR}/${RV_PATCHES_URL##*/}"
log "Patches: ${RV_PATCHES_URL##*/}"
log "${RV_PATCHES_CHANGELOG//# [/### [}\n"