From 8a515182d7ca4611d3de6170c00080c258b7b874 Mon Sep 17 00:00:00 2001
From: siritami <103488094+siritami@users.noreply.github.com>
Date: Mon, 15 May 2023 21:27:01 +0700
Subject: [PATCH] Easier for forked

---
 .github/workflows/patch.yml        | 12 +++++++++++-
 src/build/build-rv.sh              |  2 +-
 src/build/build-rve-android-6-7.sh |  2 +-
 src/build/build-rve.sh             |  2 +-
 src/build/tools.sh                 |  3 ++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index f2751df..2de7b38 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -17,9 +17,15 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '17'
-
+      - name: Print username
+        run: |
+         echo "The username is ${{ github.actor }}"
+         echo "The repository name is ${{ github.repository }}"
+        
       - name: Patch apk
         run: bash src/build/build-rv.sh  
+        env:
+          repository: ${{ github.repository }}
 
       - name: Generate release info
         run: | 
@@ -73,6 +79,8 @@ jobs:
 
       - name: Patch apk
         run: bash src/build/build-rve.sh  
+        env:
+          repository: ${{ github.repository }}
 
       - name: Generate release info
         run: | 
@@ -126,6 +134,8 @@ jobs:
 
       - name: Patch apk
         run: bash src/build/build-rve-android-6-7.sh  
+        env:
+          repository: ${{ github.repository }}
 
       - name: Generate release info
         run: | 
diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh
index 8e4bf36..726d175 100644
--- a/src/build/build-rv.sh
+++ b/src/build/build-rv.sh
@@ -7,7 +7,7 @@ asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patch
 curl -sL -O "$asset"
 ls revanced-patches*.jar >> new.txt
 rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest")
+release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
 asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
 curl -sL -O "$asset"
 if diff -q revanced-version.txt new.txt >/dev/null ; then
diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh
index 7044929..a59a31f 100644
--- a/src/build/build-rve-android-6-7.sh
+++ b/src/build/build-rve-android-6-7.sh
@@ -7,7 +7,7 @@ asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patch
 curl -sL -O "$asset"
 ls revanced-patches*.jar >> new.txt
 rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest")
+release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
 asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-android-6-7-version.txt") | .browser_download_url')
 curl -sL -O "$asset"
 if diff -q revanced-extended-android-6-7-version.txt new.txt >/dev/null ; then
diff --git a/src/build/build-rve.sh b/src/build/build-rve.sh
index de937ad..6138d74 100644
--- a/src/build/build-rve.sh
+++ b/src/build/build-rve.sh
@@ -7,7 +7,7 @@ asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patch
 curl -sL -O "$asset"
 ls revanced-patches*.jar >> new.txt
 rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest")
+release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
 asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-version.txt") | .browser_download_url')
 curl -sL -O "$asset"
 if diff -q revanced-extended-version.txt new.txt >/dev/null ; then
diff --git a/src/build/tools.sh b/src/build/tools.sh
index 472a9ca..7f7d4c7 100644
--- a/src/build/tools.sh
+++ b/src/build/tools.sh
@@ -32,6 +32,7 @@ get_largest_ver() {
 	  done
       	if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi
 }
+
 dl_apk() {
   local url=$1 regexp=$2 output=$3
   url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
@@ -112,4 +113,4 @@ change_arch() {
     else 
         exit 1
     fi
-}
+}
\ No newline at end of file