update and fix for 0.3.1

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4b6977f028d..97c333bba9f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = jfa-go
 	pkgdesc = A web app for managing users on Jellyfin
-	pkgver = 0.2.8
+	pkgver = 0.3.1
 	pkgrel = 1
 	url = https://github.com/hrfee/jfa-go
 	arch = x86_64
 	license = MIT
-	makedepends = go>=1.14
+	makedepends = go>=1.16
 	makedepends = python>=3.6.0-1
 	makedepends = nodejs
 	makedepends = npm
-	source = jfa-go::git+https://github.com/hrfee/jfa-go.git#tag=v0.2.8
+	source = jfa-go::git+https://github.com/hrfee/jfa-go.git#tag=v0.3.1
 	md5sums = SKIP
 
 pkgname = jfa-go
diff --git a/PKGBUILD b/PKGBUILD
index a5e966e74eed..743a500273a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Harvey Tindall <hrfee@protonmail.ch>
 pkgname="jfa-go"
-pkgver=0.2.8
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="A web app for managing users on Jellyfin"
 arch=("x86_64")
 url="https://github.com/hrfee/jfa-go"
 license=('MIT')
-makedepends=('go>=1.14' 'python>=3.6.0-1' 'nodejs' 'npm')
+makedepends=('go>=1.16' 'python>=3.6.0-1' 'nodejs' 'npm')
 checkdepends=()
 optdepends=()
 provides=()
@@ -23,25 +23,24 @@ validpgpkeys=()
 
 prepare() {
     cd jfa-go
-    make configuration npm email version
-    export GOPATH="$(go env GOPATH)"
     go get github.com/swaggo/swag/cmd/swag
-    "${GOPATH}"/bin/swag init -g main.go
+    make configuration npm email version
 }
 
 build() {
 	cd jfa-go
-	make typescript compile
+    make typescript bundle-css 
+    export GOPATH="$(go env GOPATH)"
+    "${GOPATH}"/bin/swag init -g main.go
+    make copy internal-files compile
 }
 
 package() {
     cd jfa-go
-    make copy
-    install -d "$pkgdir"/opt
-    make install DESTDIR="$pkgdir"/opt
     mkdir -p "$pkgdir"/usr/bin
-    chown -R root "$pkgdir"/opt/$pkgname/
-    chmod 755 "$pkgdir"/opt/$pkgname/$pkgname
-    ln -sf /opt/$pkgname/$pkgname "$pkgdir"/usr/bin/$pkgname 
+    cp build/"$pkgname" "$pkgdir"/usr/bin/"$pkgname"
+    chmod 755 "$pkgdir"/usr/bin/$pkgname
+    chown root "$pkgdir"/usr/bin/$pkgname
+    mkdir -p "$pkgdir"/usr/share/licenses
     install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }