diff --git a/build-package.sh b/build-package.sh
index 0debacc8..7eff5180 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -29,13 +29,7 @@ cd "${SRC_DIR}"
 PACKAGES_TO_BUILD_DIR="${TMP_DIR}/tobuilt"
 mkdir -p "${PACKAGES_TO_BUILD_DIR}"
 
-# check which packages to build
-while IFS= read -r pkg
-do
-  built "${pkg}"
-done < "${SRC_DIR}/built_packages.txt"
-
-built() {
+run-build() {
   pkgname="${1}"
   pkgdir="${SRC_DIR}/packages/${pkgname}"
 
@@ -99,6 +93,12 @@ built() {
   echo "::endgroup::"
 }
 
+# check which packages to build
+while IFS= read -r pkg
+do
+  run-build "${pkg}"
+done < "${SRC_DIR}/built_packages.txt"
+
 if [ -f "${SRC_DIR}/fail_built.txt" ]
 then
   printf "\n\nFailed to build:\n"
diff --git a/packages/revanced-cli/PKGBUILD b/packages/revanced-cli/PKGBUILD
index 91acb40f..467f2ad7 100644
--- a/packages/revanced-cli/PKGBUILD
+++ b/packages/revanced-cli/PKGBUILD
@@ -1,23 +1,23 @@
 # Maintainer: MedzikUser <nivua1fn@duck.com>
 pkgname='revanced-cli'
 pkgver="1.4.4"
-pkgrel=1
+pkgrel=2
 pkgdesc='Command line application as an alternative to the ReVanced Manager'
 arch=('any')
 url="https://github.com/revanced/revanced-cli"
 license=('GPL3')
-depends=('java-environment' 'revanced-patches')
+depends=('java-environment>=17' 'revanced-patches')
 optdepends=('revanced-integrations: Add support for some integrations')
 install='revanced-cli.install'
-source=("${pkgname}.sh"
-        "${url}/releases/download/v${pkgver}/revanced-cli-${pkgver}-all.jar"
-        "${url}/raw/v${pkgver}/LICENSE")
-sha256sums=('d163e7791b1010ec330383f68f8fee05b1f69d5aaba86c02de88b88453b4be53'
-            'e690497958fdd513543fedb2963386aec0e594d2ee1c722a706fe097f393dba4'
-            '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986')
+source=("${url}/releases/download/v${pkgver}/revanced-cli-${pkgver}-all.jar"
+        "${url}/raw/v${pkgver}/LICENSE"
+        "${pkgname}.sh")
+sha256sums=('e690497958fdd513543fedb2963386aec0e594d2ee1c722a706fe097f393dba4'
+            '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986'
+            'SKIP')
 
 package() {
   install -Dm 755 ${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm 644 revanced-cli-${pkgver}-all.jar "${pkgdir}/usr/share/java/${pkgname}.jar"
+  install -Dm 644 revanced-cli-${pkgver}-all.jar "${pkgdir}/usr/share/revanced/${pkgname}.jar"
   install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/packages/revanced-cli/revanced-cli.sh b/packages/revanced-cli/revanced-cli.sh
index bc0d6998..aca05801 100755
--- a/packages/revanced-cli/revanced-cli.sh
+++ b/packages/revanced-cli/revanced-cli.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -jar /usr/share/java/revanced-cli.jar ${@}
+java -jar /usr/share/revanced/revanced-cli.jar ${@}
diff --git a/packages/revanced-integrations/PKGBUILD b/packages/revanced-integrations/PKGBUILD
index 8ba508fd..735a168e 100644
--- a/packages/revanced-integrations/PKGBUILD
+++ b/packages/revanced-integrations/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: MedzikUser <nivua1fn@duck.com>
 pkgname='revanced-integrations'
 pkgver="0.10.0"
-pkgrel=1
+pkgrel=2
 pkgdesc='Integrations containing helper classes for ReVanced. Originally maintained by Vanced.'
 arch=('any')
 url="https://github.com/revanced/revanced-integrations"
diff --git a/packages/revanced-patches/PKGBUILD b/packages/revanced-patches/PKGBUILD
index b4bb9c7c..43438e14 100644
--- a/packages/revanced-patches/PKGBUILD
+++ b/packages/revanced-patches/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: MedzikUser <nivua1fn@duck.com>
 pkgname='revanced-patches'
 pkgver="1.8.0"
-pkgrel=1
+pkgrel=2
 pkgdesc='Official patches maintained by ReVanced'
 arch=('any')
 url="https://github.com/revanced/revanced-patches"
 license=('GPL3')
-depends=('java-environment' 'revanced-cli')
+depends=('java-environment>=17' 'revanced-cli')
 source=("${url}/releases/download/v${pkgver}/revanced-patches-${pkgver}.jar"
         "${url}/raw/v${pkgver}/LICENSE")
 sha256sums=('34c67b3ccfee63958028163d56d8536b68ca088f1981a2ec8a80aa25fb2328ab'
             '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986')
 
 package() {
-  install -Dm 644 revanced-patches-${pkgver}.jar "${pkgdir}/usr/share/java/${pkgname}.jar"
+  install -Dm 644 revanced-patches-${pkgver}.jar "${pkgdir}/usr/share/revanced/${pkgname}.jar"
   install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }