update by lilac

2 files changed, 11 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 784d5dccab29..fd35dc26efd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = clash
-	pkgdesc = A rule based proxy in Go.
+	pkgdesc = A rule based proxy in Go
 	pkgver = 0.15.0
-	pkgrel = 1
+	pkgrel = 5
 	url = https://github.com/Dreamacro/clash
 	arch = x86_64
 	license = MIT
@@ -13,7 +13,7 @@ pkgbase = clash
 	conflicts = clash-bin
 	source = clash@.service
 	source = clash_user.service
-	source = https://codeload.github.com/Dreamacro/clash/tar.gz/v0.15.0
+	source = clash-0.15.0.tar.gz::https://github.com/Dreamacro/clash/archive/v0.15.0.tar.gz
 	source = https://raw.githubusercontent.com/Dreamacro/clash/master/LICENSE
 	sha512sums = e9e215e0a06d0d1072467342dd72e777725b94634714c5bd5fdee31f48897d9b8ab7e83830d836533d6862fa6ebfda56dbf138edd873140de61d8ccdf2a54572
 	sha512sums = 338c3a5904623bec48c03b2ef8cf452979c229fc5b89b2e0447664b40cd6e29c83cae47a19145be76d3ee2f0b6a54184a0cff69b834ba6107b444caacc02decf
diff --git a/PKGBUILD b/PKGBUILD
index a2ab3f468f79..f94c2e613984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Luke Yue <lukedyue@gmail.com>
+# Maintainer: Ariel AxionL <i@axionl.me>
+# Contributor: Luke Yue <lukedyue@gmail.com>
 
 pkgname=clash
 pkgver=0.15.0
-pkgrel=1
-pkgdesc="A rule based proxy in Go."
+pkgrel=5
+pkgdesc="A rule based proxy in Go"
 arch=('x86_64')
 url="https://github.com/Dreamacro/clash"
 license=('MIT')
@@ -14,7 +15,7 @@ depends=('glibc')
 
 source=("clash@.service"
         "clash_user.service"
-        "https://codeload.github.com/Dreamacro/clash/tar.gz/v${pkgver}"
+        "${pkgname}-${pkgver}.tar.gz::https://github.com/Dreamacro/clash/archive/v${pkgver}.tar.gz"
         "https://raw.githubusercontent.com/Dreamacro/clash/master/LICENSE")
 
 sha512sums=('e9e215e0a06d0d1072467342dd72e777725b94634714c5bd5fdee31f48897d9b8ab7e83830d836533d6862fa6ebfda56dbf138edd873140de61d8ccdf2a54572'
@@ -22,18 +23,10 @@ sha512sums=('e9e215e0a06d0d1072467342dd72e777725b94634714c5bd5fdee31f48897d9b8ab
             '217dd66820dbbce235672c89cf8ea6b37b5034f44f20c812bc8e6137889e14e05f344631e10f07acd2eb74a5223d16ce2b467c1790f31619640de16a39bea37f'
             '46478b083104014b881ad546b89cfb16f040588f38e8c04ca664078061ba0e0653a394365d128410a9646f9159c9d9c7644a3ea42b22e4a4f240dfd6bea666c5')
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    mkdir -p .gopath/src/github.com/Dreamacro/
-    ln -sf ${PWD} .gopath/src/github.com/Dreamacro/clash
-    export GOPATH="${PWD}/.gopath"
-
-    go mod download
-}
-
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    go build -o clash
+    cd "${pkgname}-${pkgver}"
+    _build_time="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+    CGO_ENABLED=0 go build -ldflags "-extldflags ${LDFLAGS} -X github.com/Dreamacro/clash/constant.Version=${pkgver} -X github.com/Dreamacro/clash/constant.BuildTime=${_build_time} -w -s" -mod=readonly
 }
 
 package() {
@@ -43,4 +36,3 @@ package() {
     install -Dm644 "${srcdir}/clash@.service" "${pkgdir}/usr/lib/systemd/system/clash@.service"
     install -Dm644 "${srcdir}/clash_user.service" "${pkgdir}/usr/lib/systemd/user/clash.service"
 }
-