Fix package and add conflict with sass/ruby-sass

2 files changed, 8 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a75ee7a5efb6..83a408f5c77e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,9 @@ pkgbase = knightos-sass
 	groups = knightos
 	license = MIT
 	depends = mono
-	source = knightos-sass-1.3.8.tar.gz::https://github.com/KnightOS/sass/archive/1.3.8.tar.gz
+	conflicts = sass
+	conflicts = ruby-sass
+	source = sass-1.3.8.tar.gz::https://github.com/KnightOS/sass/archive/1.3.8.tar.gz
 	sha256sums = dd36c15c74f425d855632996afbc124c26a507fd183df42d7dfecd7b4f0221c2
 
 pkgname = knightos-sass
diff --git a/PKGBUILD b/PKGBUILD
index 1de648428df7..b1accdf73222 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,24 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=knightos-sass
+_pkgname=${pkgname#*-}
 pkgver=1.3.8
 pkgrel=2
 license=("MIT")
 pkgdesc='A featureful z80 assembler'
 groups=("knightos")
+conflicts=("sass" "ruby-sass")
 depends=("mono")
 arch=("x86_64")
 url='https://github.com/KnightOS/sass'
-source=("$pkgname-$pkgver.tar.gz::https://github.com/KnightOS/sass/archive/${pkgver}.tar.gz")
+source=("${_pkgname}-$pkgver.tar.gz::https://github.com/KnightOS/sass/archive/${pkgver}.tar.gz")
 sha256sums=('dd36c15c74f425d855632996afbc124c26a507fd183df42d7dfecd7b4f0221c2')
 
 build() {
-	cd "$pkgname-$pkgver"
+	cd "${_pkgname}-$pkgver"
 	make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
+	cd "${_pkgname}-$pkgver"
 	make install DESTDIR="$pkgdir/usr" PREFIX="/usr"
 }