From 13f1c6a4b66f4ecd0b44b674c7d61681df5ae0c0 Mon Sep 17 00:00:00 2001 From: j-hc Date: Sun, 3 Jul 2022 23:03:25 +0300 Subject: [PATCH] exclude premium-heading patch Former-commit-id: 5f35d945d31f9278a74de050208ae10977e14607 --- .github/workflows/build.yml | 6 +++++- .gitignore | 1 + build-module.sh | 12 ++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 696a72e..6b828e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,16 @@ jobs: echo ::set-output name=OUTPUT::$(find . -maxdepth 1 -name "revanced-magisk-*.zip" -printf '%P') echo ::set-output name=VERSION::$(find . -maxdepth 1 -name "revanced-magisk-*.zip" -printf '%P' | sed -n 's/.*revanced-magisk-\(.*\)\.zip.*/\1/p') shell: bash + - name: Current Date + id: date + run: echo "::set-output name=DATE::$(date +'%m-%d')" - name: Upload release uses: svenstaro/upload-release-action@v2 with: + body: ${{ steps.date.outputs.DATE }} repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.get_output_name.outputs.OUTPUT }} asset_name: ${{ steps.get_output_name.outputs.OUTPUT }} release_name: ${{ steps.get_output_name.outputs.OUTPUT }} - tag: ${{ steps.get_output_name.outputs.VERSION }} + tag: 2022-${{ steps.get_output_name.outputs.VERSION }}-${{ steps.date.outputs.DATE }} overwrite: true diff --git a/.gitignore b/.gitignore index 9389b3e..337c3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.apk *.zip *.keystore +revanced-cache .v* diff --git a/build-module.sh b/build-module.sh index aa57336..71b58b6 100755 --- a/build-module.sh +++ b/build-module.sh @@ -7,7 +7,7 @@ echo "All necessary files (revanced cli, patches and integrations, stock YouTube WGET_HEADER='User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0' function req() { - wget -nv -O $2 --header="$WGET_HEADER" $1 + wget -nv --show-progress -O $2 --header="$WGET_HEADER" $1 } # yes this is how i download the stock yt apk from apkmirror @@ -41,7 +41,7 @@ SUPPORTED_VERSIONS=$(unzip -p $RV_PATCHES_JAR | strings -n 8 -s , | sed -rn 's/. echo "Supported versions of the patch: $SUPPORTED_VERSIONS" LAST_VER=$(echo $SUPPORTED_VERSIONS | awk -F, '{ print $NF }') echo "Choosing $LAST_VER" -BASE_APK="base-v$LAST_VER.apk" +BASE_APK="base-v${LAST_VER}.apk" if [ ! -f $BASE_APK ]; then echo "$BASE_APK could not be found, will be downloaded from apkmirror.." @@ -49,14 +49,14 @@ if [ ! -f $BASE_APK ]; then unzip -p yt-stock-v$LAST_VER.zip base.apk >$BASE_APK fi -java -jar $RV_CLI_JAR -a $BASE_APK -c -o revanced-base.apk -b $RV_PATCHES_JAR -e microg-support -m $RV_INTEGRATIONS_APK +java -jar $RV_CLI_JAR -a $BASE_APK -c -o revanced-base.apk -b $RV_PATCHES_JAR -e microg-support -e premium-heading -m $RV_INTEGRATIONS_APK mv -f revanced-base.apk ./revanced-magisk/revanced-base.apk echo "Creating the magisk module..." -OUTPUT="revanced-magisk-v$LAST_VER.zip" -sed -i "s/version=v.*$/version=v$LAST_VER/g" ./revanced-magisk/module.prop +OUTPUT="revanced-magisk-v${LAST_VER}.zip" +sed -i "s/version=v.*$/version=v${LAST_VER}/g" ./revanced-magisk/module.prop cd revanced-magisk zip -r ../$OUTPUT . -echo "Created the magisk module '$OUTPUT'" +echo "Created the magisk module '${OUTPUT}'"