Fix

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b65263dcf3e3..b16470b609ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = recaf-git
 	depends = java-openjfx
 	depends = ttf-font
 	provides = recaf
+	conflicts = recaf
 	conflicts = recaf-bin
 	replaces = recaf
 	source = recaf::git+https://github.com/Col-E/Recaf#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index d3ece837baa0..9503c27586a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ license=("MIT")
 depends=("java-runtime" "java-openjfx" "ttf-font")
 makedepends=("git")
 provides=("$_pkgname")
-conflicts=("$_pkgname-bin")
+conflicts=("$_pkgname" "$_pkgname-bin")
 replaces=("recaf")
 source=("recaf::git+https://github.com/Col-E/Recaf#branch=master")
 md5sums=("SKIP")
@@ -32,13 +32,12 @@ build() {
 
 package() {
 	cd "$srcdir/$_pkgname"
-	echo "$srcdir/$_pkgname"
 	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm755 "target/$_pkgname-$(git describe --tags --abbrev=0)-J8-jar-with-dependencies.jar" "$pkgdir/usr/share/java/$_pkgname/$_pkgname.jar"
-  install -Dm644 "src/main/resources/icons/logo.png" "$pkgdir/usr/share/pixmaps/recaf.png"
-  printf '#!/usr/bin/env bash\nexec java -cp "/usr/lib/jvm/default-runtime/lib/*:/usr/share/java/%s/%s.jar" "me.coley.recaf.Recaf" "$@"' "$_pkgname" "$_pkgname" > "recaf"
-  printf "[Desktop Entry]\nType=Application\nVersion=1.0\nName=Recaf\nComment=%s\nPath=/usr/bin\nExec=recaf %%u\nIcon=recaf\nTerminal=false\nCategories=Development;Java" "$pkgdesc" > "recaf.desktop"
-  install -Dm755 "recaf" "$pkgdir/usr/bin/recaf"
-  install -Dm644 "recaf.desktop" "$pkgdir/usr/share/applications/recaf.desktop"
-  chmod 775 "$pkgdir/usr/bin/$_pkgname"
+    install -Dm755 "target/$_pkgname-$(git describe --tags --abbrev=0)-J8-jar-with-dependencies.jar" "$pkgdir/usr/share/java/$_pkgname/$_pkgname.jar"
+    install -Dm644 "src/main/resources/icons/logo.png" "$pkgdir/usr/share/pixmaps/recaf.png"
+    printf '#!/usr/bin/env bash\nexec java -cp "/usr/lib/jvm/default-runtime/lib/*:/usr/share/java/%s/%s.jar" "me.coley.recaf.Recaf" "$@"' "$_pkgname" "$_pkgname" > "recaf"
+    printf "[Desktop Entry]\nType=Application\nVersion=1.0\nName=Recaf\nComment=%s\nPath=/usr/bin\nExec=recaf %%u\nIcon=recaf\nTerminal=false\nCategories=Development;Java" "$pkgdesc" > "recaf.desktop"
+    install -Dm755 "recaf" "$pkgdir/usr/bin/recaf"
+    install -Dm644 "recaf.desktop" "$pkgdir/usr/share/applications/recaf.desktop"
+    chmod 775 "$pkgdir/usr/bin/$_pkgname"
 }