feat: v0.3.0.r102.ga70ad6b-1

5 files changed, 25 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95ad11f3b16e..d266e3f7962e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,17 @@
 pkgbase = clash-dashboard-git
-	pkgdesc = web port of clash
-	pkgver = 20200107.11db44d
+	pkgdesc = Web Dashboard for Clash
+	pkgver = 0.3.0.r102.ga70ad6b
 	pkgrel = 1
 	url = https://github.com/Dreamacro/clash-dashboard
-	install = clash-dashboard.install
 	arch = any
 	license = MIT
-	makedepends = npm
-	makedepends = nodejs
 	makedepends = git
-	depends = nodejs
-	optdepends = nginx: web server
-	optdepends = apache: web server
+	makedepends = yarn
+	depends = clash
+	provides = clash-dashboard
 	conflicts = clash-dashboard
-	options = !strip
-	source = clash-dashboard::git+https://github.com/Dreamacro/clash-dashboard.git
-	source = clash-dashboard.service
-	sha1sums = SKIP
-	sha1sums = 14481461e8af49e6d5bcfb3e23546f96697ebf17
+	source = git+https://github.com/Dreamacro/clash-dashboard.git
+	sha256sums = SKIP
 
 pkgname = clash-dashboard-git
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 86f0a8851f78..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-clash-dashboard
-pkg
-src
-*.log
-*.tar.gz
-*.pkg.tar.xz
-*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 6e5459a70820..e1c73d497831 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,35 @@
-# Maintainer: peeweep <peeweep at 0x0 dot ee>
+# Maintainer: Dct Mei <dctxmei@gmail.com>
 
 pkgname=clash-dashboard-git
 _pkgname=clash-dashboard
-pkgver=20200107.11db44d
+pkgver=0.3.0.r102.ga70ad6b
 pkgrel=1
-pkgdesc="web port of clash"
+pkgdesc="Web Dashboard for Clash"
 arch=('any')
 url="https://github.com/Dreamacro/clash-dashboard"
 license=('MIT')
-depends=('nodejs')
-makedepends=('npm' 'nodejs' 'git')
-optdepends=(
-  "nginx: web server"
-  "apache: web server"
-)
-options=(!strip)
-install=${_pkgname}.install
+depends=('clash')
+makedepends=('git' 'yarn')
+provides=("clash-dashboard")
 conflicts=('clash-dashboard')
-source=("${_pkgname}::git+$url.git"
-  "${_pkgname}.service")
-sha1sums=('SKIP'
-          '14481461e8af49e6d5bcfb3e23546f96697ebf17')
+source=("git+${url}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  git log -1 --format='%cd.%h' --date=short | tr -d -
-}
-
-prepare() {
-  cd "${srcdir}/${_pkgname}"
-  npm install --cache "${srcdir}/npm-cache"
+    cd "${srcdir}"/"${_pkgname}"/
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
-  npm run-script build
+    cd "${srcdir}"/"${_pkgname}"/ yarn cache clean
+    yarn install
+    yarn build
 }
 
 package() {
-  install -dm755 "${pkgdir}/usr/share"
-  cp -r "${srcdir}/${_pkgname}" "${pkgdir}/usr/share/${_pkgname}"
-  find "${pkgdir}/usr/share/${_pkgname}/node_modules" \
-    -name "*.a" -exec rm '{}' \; \
-    -or -name "*.bat" -exec rm '{}' \; \
-    -or -name "*.c" -exec rm '{}' \; \
-    -or -name "*.cpp" -exec rm '{}' \; \
-    -or -name "*.node" -exec chmod a-x '{}' \; \
-    -or -name "benchmark" -prune -exec rm -r '{}' \; \
-    -or -name "doc" -prune -exec rm -r '{}' \; \
-    -or -name "html" -prune -exec rm -r '{}' \; \
-    -or -name "man" -prune -exec rm -r '{}' \; \
-    -or -name "scripts" -prune -exec rm -r '{}' \;
-  install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
+    cd "${srcdir}"/"${_pkgname}"/
+    install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/"${pkgname}"/
+    cd dist/
+    find . -type d -exec install -vd "${pkgdir}"/usr/share/"${pkgname}"/{} \;
+    find . -type f -exec install -vm 644 {} "${pkgdir}"/usr/share/"${pkgname}"/{} \;
 }
diff --git a/clash-dashboard.install b/clash-dashboard.install
deleted file mode 100644
index 96cbec565601..000000000000
--- a/clash-dashboard.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  cat <<EOF
-
-  Please exec
-  $ sudo systemctl enable clash-dashboard
-  $ sudo systemctl start clash-dashboard
-  
-  or set /usr/share/clash-dashboard/dist as nginx server's root
-
-EOF
-}
diff --git a/clash-dashboard.service b/clash-dashboard.service
deleted file mode 100644
index 09cca6062c87..000000000000
--- a/clash-dashboard.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=web port of clash
-After=network.target
-
-[Service]
-WorkingDirectory=/usr/share/clash-dashboard
-ExecStart=/usr/bin/node node_modules/.bin/webpack-dev-server --config=configs/webpack/dev.js
-
-[Install]
-WantedBy=multi-user.target