fix web resources

2 files changed, 15 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd0de066ed35..747836bb3b86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alist
 	pkgdesc = File list program that supports multiple storage
 	pkgver = 3.29.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/alist-org/alist
 	install = alist.install
 	arch = x86_64
@@ -17,11 +17,13 @@ pkgbase = alist
 	depends = glibc
 	backup = etc/alist/config.json
 	source = alist-3.29.1.tar.gz::https://github.com/alist-org/alist/archive/v3.29.1.tar.gz
+	source = dist-3.29.1.tar.gz::https://github.com/alist-org/alist-web/releases/download/3.29.0/dist.tar.gz
 	source = alist.service
 	source = alist.tmpfiles
 	source = alist.sysusers
 	source = config.json
 	sha256sums = b7d1929d9aef511b263673dba8e5b787f695e1b4fa4555fe562f8060ee0bdea4
+	sha256sums = ece9d3fd45f18eaa7376e5fc077ebeae8f67b7bcf6004a29ae58392bfc2a3d13
 	sha256sums = 5712b21aebf669fe9fb5d47dd685809d4d9670b1bb1d5e6fef962b9d11ba9d72
 	sha256sums = c6b62c4a750ab921c2e8f965e4baeee28855c9a969b00eddd346670f2fdf12de
 	sha256sums = 3658370660806f73c3d9bc5f1b6e2a013c9520d34ffc4462df99f7692473613d
diff --git a/PKGBUILD b/PKGBUILD
index 9eab7192520e..e1ce03fb1baf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=alist
 pkgver=3.29.1
-pkgrel=1
+pkgrel=2
 pkgdesc="File list program that supports multiple storage"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'arm7vh' 'aarch64' 'riscv64' 'loong64')
 url="https://github.com/alist-org/alist"
@@ -12,20 +12,23 @@ makedepends=('go')
 backup=('etc/alist/config.json')
 install=alist.install
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        'alist.service'
-        'alist.tmpfiles'
-		'alist.sysusers'
-        'config.json')
+    "dist-$pkgver.tar.gz::https://github.com/alist-org/alist-web/releases/download/${pkgver%.*}.0/dist.tar.gz"
+    'alist.service'
+    'alist.tmpfiles'
+    'alist.sysusers'
+    'config.json')
 sha256sums=('b7d1929d9aef511b263673dba8e5b787f695e1b4fa4555fe562f8060ee0bdea4'
+            'ece9d3fd45f18eaa7376e5fc077ebeae8f67b7bcf6004a29ae58392bfc2a3d13'
             '5712b21aebf669fe9fb5d47dd685809d4d9670b1bb1d5e6fef962b9d11ba9d72'
             'c6b62c4a750ab921c2e8f965e4baeee28855c9a969b00eddd346670f2fdf12de'
             '3658370660806f73c3d9bc5f1b6e2a013c9520d34ffc4462df99f7692473613d'
             'b72f194a7b8855e97eeb76e63e179f38132cc9e6be9daa5b396699c9c11611de')
 
 prepare() {
-	cd "$pkgname-$pkgver"
-	mkdir -p build
-	go mod download
+    cd "${srcdir}/$pkgname-$pkgver"
+    rm -rf public/dist
+    mv -f "${srcdir}/dist" public
+    mkdir -p build
 }
 
 build() {
@@ -35,6 +38,7 @@ build() {
 	export CGO_LDFLAGS="${LDFLAGS}"
 	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
 	cd "$pkgname-$pkgver"
+	go mod download
 	## i tried, doesn't actually tag properly
 	go build -o build \
 		-ldflags="-linkmode external -extldflags \"${LDFLAGS}\" \
@@ -42,16 +46,6 @@ build() {
 		-X 'github.com/alist-org/alist/conf.GitTag=$pkgver'"
 }
 
-## FIXME: tests require an active connection
-# check() {
-# 	export CGO_CPPFLAGS="${CPPFLAGS}"
-# 	export CGO_CFLAGS="${CFLAGS}"
-# 	export CGO_CXXFLAGS="${CXXFLAGS}"
-# 	export CGO_LDFLAGS="${LDFLAGS}"
-# 	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-# 	cd "$pkgname-$pkgver"
-# 	go test ./...
-# }
 
 package() {
 	cd "$pkgname-$pkgver"